V4L/DVB (4014): Remove the spagetti code gotos that aren't useful
authorTrent Piepho <xyzzy@speakeasy.org>
Fri, 12 May 2006 23:36:24 +0000 (20:36 -0300)
committerMauro Carvalho Chehab <mchehab@infradead.org>
Sun, 25 Jun 2006 05:00:23 +0000 (02:00 -0300)
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>
drivers/media/dvb/b2c2/flexcop-pci.c
drivers/media/dvb/b2c2/flexcop-usb.c
drivers/media/dvb/b2c2/flexcop.c
drivers/media/dvb/dvb-usb/dtt200u-fe.c
drivers/media/dvb/dvb-usb/dvb-usb-dvb.c
drivers/media/dvb/dvb-usb/vp702x-fe.c
drivers/media/dvb/dvb-usb/vp7045-fe.c

index 9bc40bdcc282e2bd1d25a79e6275aaab0e3ec780..f04041702191e7eb303f0920820f038756ee5d75 100644 (file)
@@ -242,19 +242,16 @@ static int flexcop_pci_dma_init(struct flexcop_pci *fc_pci)
        if ((ret = flexcop_dma_allocate(fc_pci->pdev,&fc_pci->dma[0],FC_DEFAULT_DMA1_BUFSIZE)) != 0)
                return ret;
 
-       if ((ret = flexcop_dma_allocate(fc_pci->pdev,&fc_pci->dma[1],FC_DEFAULT_DMA2_BUFSIZE)) != 0)
-               goto dma1_free;
+       if ((ret = flexcop_dma_allocate(fc_pci->pdev,&fc_pci->dma[1],FC_DEFAULT_DMA2_BUFSIZE)) != 0) {
+               flexcop_dma_free(&fc_pci->dma[0]);
+               return ret;
+       }
 
        flexcop_sram_set_dest(fc_pci->fc_dev,FC_SRAM_DEST_MEDIA | FC_SRAM_DEST_NET, FC_SRAM_DEST_TARGET_DMA1);
        flexcop_sram_set_dest(fc_pci->fc_dev,FC_SRAM_DEST_CAO   | FC_SRAM_DEST_CAI, FC_SRAM_DEST_TARGET_DMA2);
 
        fc_pci->init_state |= FC_PCI_DMA_INIT;
 
-       goto success;
-dma1_free:
-       flexcop_dma_free(&fc_pci->dma[0]);
-
-success:
        return ret;
 }
 
@@ -303,7 +300,7 @@ static int flexcop_pci_init(struct flexcop_pci *fc_pci)
        spin_lock_init(&fc_pci->irq_lock);
 
        fc_pci->init_state |= FC_PCI_INIT;
-       goto success;
+       return ret;
 
 err_pci_iounmap:
        pci_iounmap(fc_pci->pdev, fc_pci->io_mem);
@@ -312,8 +309,6 @@ err_pci_release_regions:
        pci_release_regions(fc_pci->pdev);
 err_pci_disable_device:
        pci_disable_device(fc_pci->pdev);
-
-success:
        return ret;
 }
 
@@ -378,14 +373,14 @@ static int flexcop_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e
 
        INIT_WORK(&fc_pci->irq_check_work, flexcop_pci_irq_check_work, fc_pci);
 
-       goto success;
+       return ret;
+
 err_fc_exit:
        flexcop_device_exit(fc);
 err_pci_exit:
        flexcop_pci_exit(fc_pci);
 err_kfree:
        flexcop_device_kfree(fc);
-success:
        return ret;
 }
 
index 06ec9fff0ec1e5f5d3293685e5f49d9c73a71421..515954f96c9a6afa11eb5e708963216590ee5bdb 100644 (file)
@@ -433,11 +433,10 @@ static int flexcop_usb_transfer_init(struct flexcop_usb *fc_usb)
        flexcop_wan_set_speed(fc_usb->fc_dev,FC_WAN_SPEED_8MBITS);
        flexcop_sram_ctrl(fc_usb->fc_dev,1,1,1);
 
-       ret = 0;
-       goto success;
+       return 0;
+
 urb_error:
        flexcop_usb_transfer_exit(fc_usb);
-success:
        return ret;
 }
 
@@ -515,15 +514,14 @@ static int flexcop_usb_probe(struct usb_interface *intf,
                goto err_fc_exit;
 
        info("%s successfully initialized and connected.",DRIVER_NAME);
-       ret = 0;
-       goto success;
+       return 0;
+
 err_fc_exit:
        flexcop_device_exit(fc);
 err_usb_exit:
        flexcop_usb_exit(fc_usb);
 err_kfree:
        flexcop_device_kfree(fc);
-success:
        return ret;
 }
 
index 5c276b3793ea21a708f602f3c632cbf0c44af104..29ec4183118e80f744aed424dc1d1715b1b9aeef 100644 (file)
@@ -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);
index cd21ddbfd05479f9be098ba01e8fe8c1011f064c..2df6da2b54f845f7fe54dd3926b8f000a3691fb1 100644 (file)
@@ -168,11 +168,9 @@ struct dvb_frontend* dtt200u_fe_attach(struct dvb_usb_device *d)
        state->frontend.ops = &state->ops;
        state->frontend.demodulator_priv = state;
 
-       goto success;
+       return &state->frontend;
 error:
        return NULL;
-success:
-       return &state->frontend;
 }
 
 static struct dvb_frontend_ops dtt200u_fe_ops = {
index 500896d02d5a3664f515e1d4e908cd0924c1d34e..2517b228381d62d29c680990371e694b53ed9cc9 100644 (file)
@@ -121,16 +121,15 @@ int dvb_usb_dvb_init(struct dvb_usb_device *d)
 
        dvb_net_init(&d->dvb_adap, &d->dvb_net, &d->demux.dmx);
 
-       goto success;
+       d->state |= DVB_USB_STATE_DVB;
+       return 0;
+
 err_dmx_dev:
        dvb_dmx_release(&d->demux);
 err_dmx:
        dvb_unregister_adapter(&d->dvb_adap);
 err:
        return ret;
-success:
-       d->state |= DVB_USB_STATE_DVB;
-       return 0;
 }
 
 int dvb_usb_dvb_exit(struct dvb_usb_device *d)
index 2a89f8c5da99cf78c8af7fde74c67dd24282d0c1..9d26f46de0911afda26ff0f9382082488dc44fa9 100644 (file)
@@ -293,11 +293,9 @@ struct dvb_frontend * vp702x_fe_attach(struct dvb_usb_device *d)
        s->lnb_buf[1] = SET_LNB_POWER;
        s->lnb_buf[3] = 0xff; /* 0=tone burst, 2=data burst, ff=off */
 
-       goto success;
+       return &s->fe;
 error:
        return NULL;
-success:
-       return &s->fe;
 }
 
 
index 9999336aeeb6797aaa0a6c8be91d3fbde1aafe9d..e98e5a517f5a503697accb636adfa8be4b110c7e 100644 (file)
@@ -155,11 +155,9 @@ struct dvb_frontend * vp7045_fe_attach(struct dvb_usb_device *d)
        s->fe.ops = &s->ops;
        s->fe.demodulator_priv = s;
 
-       goto success;
+       return &s->fe;
 error:
        return NULL;
-success:
-       return &s->fe;
 }