remove name/vendor/id strings, these caused only troubles everywhere and nobody really needs them...

4 files changed, 12 insertions, 38 deletions

diff --git a/linux/drivers/media/dvb/ttpci/av7110.c b/linux/drivers/media/dvb/ttpci/av7110.c
index 9578a1036..2e17388c8 100644
--- a/linux/drivers/media/dvb/ttpci/av7110.c
+++ b/linux/drivers/media/dvb/ttpci/av7110.c
@@ -3850,7 +3850,6 @@ static
 int av7110_register(av7110_t *av7110)
 {
         int ret, i;
-        dmx_frontend_t *dvbfront=&av7110->hw_frontend;
         struct dvb_demux *dvbdemux=&av7110->demux;
 
 	DEB_EE(("av7110: %p\n",av7110));
@@ -3883,8 +3882,6 @@ int av7110_register(av7110_t *av7110)
 	av7110->videostate.display_format=VIDEO_CENTER_CUT_OUT;
         av7110->display_ar=VIDEO_FORMAT_4_3;
 
-        memcpy(av7110->demux_id, "demux0_0", 9);
-        av7110->demux_id[5] = av7110->dvb_adapter->num + '0';
         dvbdemux->priv = (void *) av7110;
 
 	for (i=0; i<32; i++)
@@ -3895,34 +3892,25 @@ int av7110_register(av7110_t *av7110)
 	dvbdemux->start_feed = av7110_start_feed;
 	dvbdemux->stop_feed = av7110_stop_feed;
 	dvbdemux->write_to_decoder = av7110_write_to_decoder;
-	dvbdemux->dmx.vendor = "TI";
-	dvbdemux->dmx.model = "AV7110";
-	dvbdemux->dmx.id = av7110->demux_id;
 	dvbdemux->dmx.capabilities = (DMX_TS_FILTERING | DMX_SECTION_FILTERING |
 				      DMX_MEMORY_BASED_FILTERING);
 
 	dvb_dmx_init(&av7110->demux);
 	av7110->demux.dmx.get_stc = dvb_get_stc;
 
-	dvbfront->id = "hw_frontend";
-	dvbfront->vendor = "VLSI";
-	dvbfront->model = "DVB Frontend";
-	dvbfront->source = DMX_FRONTEND_0;
-
 	av7110->dmxdev.filternum = 32;
 	av7110->dmxdev.demux = &dvbdemux->dmx;
 	av7110->dmxdev.capabilities = 0;
         
 	dvb_dmxdev_init(&av7110->dmxdev, av7110->dvb_adapter);
 
-        ret = dvbdemux->dmx.add_frontend(&dvbdemux->dmx, 
-					 &av7110->hw_frontend);
-        if (ret < 0)
+        av7110->hw_frontend.source = DMX_FRONTEND_0;
+
+        ret = dvbdemux->dmx.add_frontend(&dvbdemux->dmx, &av7110->hw_frontend);
+
+	if (ret < 0)
                 return ret;
         
-        av7110->mem_frontend.id = "mem_frontend";
-        av7110->mem_frontend.vendor = "memory";
-        av7110->mem_frontend.model = "sw";
         av7110->mem_frontend.source = DMX_MEMORY_FE;
 
 	ret = dvbdemux->dmx.add_frontend(&dvbdemux->dmx, &av7110->mem_frontend);
diff --git a/linux/drivers/media/dvb/ttpci/av7110.h b/linux/drivers/media/dvb/ttpci/av7110.h
index 22ef8fcae..bea411146 100644
--- a/linux/drivers/media/dvb/ttpci/av7110.h
+++ b/linux/drivers/media/dvb/ttpci/av7110.h
@@ -525,8 +525,7 @@ typedef struct av7110_s {
 
         int                     vidmode;
         dmxdev_t                dmxdev;
-        struct dvb_demux             demux;
-        char                    demux_id[16];
+        struct dvb_demux        demux;
 
         dmx_frontend_t          hw_frontend;
         dmx_frontend_t          mem_frontend;
diff --git a/linux/drivers/media/dvb/ttpci/budget-core.c b/linux/drivers/media/dvb/ttpci/budget-core.c
index bdf81a82e..e1a606c65 100644
--- a/linux/drivers/media/dvb/ttpci/budget-core.c
+++ b/linux/drivers/media/dvb/ttpci/budget-core.c
@@ -129,14 +129,11 @@ int budget_stop_feed(struct dvb_demux_feed *feed)
 static
 int budget_register(struct budget *budget)
 {
+        struct dvb_demux *dvbdemux = &budget->demux;
         int ret;
-        dmx_frontend_t *dvbfront=&budget->hw_frontend;
-        struct dvb_demux *dvbdemux=&budget->demux;
 
 	DEB_EE(("budget: %p\n",budget));
 
-        memcpy(budget->demux_id, "demux0_0", 9);
-        budget->demux_id[5] = budget->dvb_adapter->num + '0';
         dvbdemux->priv = (void *) budget;
 
 	dvbdemux->filternum = 256;
@@ -145,33 +142,24 @@ int budget_register(struct budget *budget)
         dvbdemux->stop_feed = budget_stop_feed;
         dvbdemux->write_to_decoder = NULL;
 
-        dvbdemux->dmx.vendor = "CIM";
-        dvbdemux->dmx.model = "sw";
-        dvbdemux->dmx.id = budget->demux_id;
         dvbdemux->dmx.capabilities = (DMX_TS_FILTERING | DMX_SECTION_FILTERING |
                                       DMX_MEMORY_BASED_FILTERING);
 
         dvb_dmx_init(&budget->demux);
 
-        dvbfront->id = "hw_frontend";
-        dvbfront->vendor = "VLSI";
-        dvbfront->model = "DVB Frontend";
-        dvbfront->source = DMX_FRONTEND_0;
-
         budget->dmxdev.filternum = 256;
         budget->dmxdev.demux = &dvbdemux->dmx;
         budget->dmxdev.capabilities = 0;
 
         dvb_dmxdev_init(&budget->dmxdev, budget->dvb_adapter);
 
-        ret=dvbdemux->dmx.add_frontend (&dvbdemux->dmx, 
-                                        &budget->hw_frontend);
-        if (ret < 0)
+        budget->hw_frontend.source = DMX_FRONTEND_0;
+
+        ret = dvbdemux->dmx.add_frontend(&dvbdemux->dmx, &budget->hw_frontend);
+
+	if (ret < 0)
                 return ret;
         
-        budget->mem_frontend.id = "mem_frontend";
-        budget->mem_frontend.vendor = "memory";
-        budget->mem_frontend.model = "sw";
         budget->mem_frontend.source = DMX_MEMORY_FE;
         ret=dvbdemux->dmx.add_frontend (&dvbdemux->dmx, 
                                         &budget->mem_frontend);
diff --git a/linux/drivers/media/dvb/ttpci/budget.h b/linux/drivers/media/dvb/ttpci/budget.h
index 1aaae11c6..f3f10f604 100644
--- a/linux/drivers/media/dvb/ttpci/budget.h
+++ b/linux/drivers/media/dvb/ttpci/budget.h
@@ -39,7 +39,6 @@ struct budget {
 
         dmxdev_t                dmxdev;
         struct dvb_demux	demux;
-        char                    demux_id[16];
 
         dmx_frontend_t          hw_frontend;
         dmx_frontend_t          mem_frontend;