aboutsummaryrefslogtreecommitdiff
path: root/drivers/media/dvb/b2c2/flexcop.c
diff options
context:
space:
mode:
authorTrent Piepho <xyzzy@speakeasy.org>2006-05-12 20:36:24 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-06-25 02:00:23 -0300
commit8397703ee0cc9ca27df5c058f60c4d4f1dc69595 (patch)
treea4c3e7c3715778eb2ce6ef0981fcebea5499f3ec /drivers/media/dvb/b2c2/flexcop.c
parent19b7ad314897cf4a2122208c6b9a372c50308c19 (diff)
V4L/DVB (4014): Remove the spagetti code gotos that aren't useful
Some code had pointless gotos that just didn't make any sense. They didn't make the code smaller, or faster, or easier to understand. Signed-off-by: Trent Piepho <xyzzy@speakeasy.org> Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/dvb/b2c2/flexcop.c')
-rw-r--r--drivers/media/dvb/b2c2/flexcop.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/media/dvb/b2c2/flexcop.c b/drivers/media/dvb/b2c2/flexcop.c
index 5c276b3793e..29ec4183118 100644
--- a/drivers/media/dvb/b2c2/flexcop.c
+++ b/drivers/media/dvb/b2c2/flexcop.c
@@ -116,7 +116,7 @@ static int flexcop_dvb_init(struct flexcop_device *fc)
dvb_net_init(&fc->dvb_adapter, &fc->dvbnet, &fc->demux.dmx);
fc->init_state |= FC_STATE_DVB_INIT;
- goto success;
+ return 0;
err_connect_frontend:
fc->demux.dmx.remove_frontend(&fc->demux.dmx,&fc->mem_frontend);
@@ -129,9 +129,6 @@ err_dmx_dev:
err_dmx:
dvb_unregister_adapter(&fc->dvb_adapter);
return ret;
-
-success:
- return 0;
}
static void flexcop_dvb_exit(struct flexcop_device *fc)
@@ -279,11 +276,10 @@ int flexcop_device_initialize(struct flexcop_device *fc)
flexcop_device_name(fc,"initialization of","complete");
- ret = 0;
- goto success;
+ return 0;
+
error:
flexcop_device_exit(fc);
-success:
return ret;
}
EXPORT_SYMBOL(flexcop_device_initialize);