Change the signature of dmx_register_demux() as it can not fail.
The modification is propagated to the single user of the function
throughout the tree.
Signed-off-by: Francois Romieu <romieu@xxxxxxxxxxxxx>
diff -puN drivers/media/dvb/dvb-core/dvb_demux.c~dvb-140 drivers/media/dvb/dvb-core/dvb_demux.c
--- a/drivers/media/dvb/dvb-core/dvb_demux.c~dvb-140 2005-05-20 19:22:41.533865818 +0200
+++ b/drivers/media/dvb/dvb-core/dvb_demux.c 2005-05-20 19:22:41.554862316 +0200
@@ -42,11 +42,10 @@
static LIST_HEAD(dmx_muxs);
-static int dmx_register_demux(struct dmx_demux *demux)
+static void dmx_register_demux(struct dmx_demux *demux)
{
demux->users = 0;
list_add(&demux->reg_list, &dmx_muxs);
- return 0;
}
static int dmx_unregister_demux(struct dmx_demux* demux)
@@ -1208,8 +1207,8 @@ static int dvbdmx_get_pes_pids(struct dm
int dvb_dmx_init(struct dvb_demux *dvbdemux)
{
- int i, err;
struct dmx_demux *dmx = &dvbdemux->dmx;
+ int i;
dvbdemux->users = 0;
dvbdemux->filter = vmalloc(dvbdemux->filternum*sizeof(struct dvb_demux_filter));
@@ -1274,8 +1273,7 @@ int dvb_dmx_init(struct dvb_demux *dvbde
sema_init(&dvbdemux->mutex, 1);
spin_lock_init(&dvbdemux->lock);
- if ((err = dmx_register_demux(dmx)) < 0)
- return err;
+ dmx_register_demux(dmx);
return 0;
}
_
