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>

7 files changed, 20 insertions, 38 deletions

diff --git a/drivers/media/dvb/b2c2/flexcop-pci.c b/drivers/media/dvb/b2c2/flexcop-pci.c
index 9bc40bdcc2..f040417021 100644
--- a/drivers/media/dvb/b2c2/flexcop-pci.c
+++ b/drivers/media/dvb/b2c2/flexcop-pci.c
@@ -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;
 }
 
diff --git a/drivers/media/dvb/b2c2/flexcop-usb.c b/drivers/media/dvb/b2c2/flexcop-usb.c
index 06ec9fff0e..515954f96c 100644
--- a/drivers/media/dvb/b2c2/flexcop-usb.c
+++ b/drivers/media/dvb/b2c2/flexcop-usb.c
@@ -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;
 }
 
diff --git a/drivers/media/dvb/b2c2/flexcop.c b/drivers/media/dvb/b2c2/flexcop.c
index 5c276b3793..29ec418311 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);
diff --git a/drivers/media/dvb/dvb-usb/dtt200u-fe.c b/drivers/media/dvb/dvb-usb/dtt200u-fe.c
index cd21ddbfd0..2df6da2b54 100644
--- a/drivers/media/dvb/dvb-usb/dtt200u-fe.c
+++ b/drivers/media/dvb/dvb-usb/dtt200u-fe.c
@@ -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 = {
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c b/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c
index 500896d02d..2517b22838 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c
@@ -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)
diff --git a/drivers/media/dvb/dvb-usb/vp702x-fe.c b/drivers/media/dvb/dvb-usb/vp702x-fe.c
index 2a89f8c5da..9d26f46de0 100644
--- a/drivers/media/dvb/dvb-usb/vp702x-fe.c
+++ b/drivers/media/dvb/dvb-usb/vp702x-fe.c
@@ -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;
 }
 
 
diff --git a/drivers/media/dvb/dvb-usb/vp7045-fe.c b/drivers/media/dvb/dvb-usb/vp7045-fe.c
index 9999336aee..e98e5a517f 100644
--- a/drivers/media/dvb/dvb-usb/vp7045-fe.c
+++ b/drivers/media/dvb/dvb-usb/vp7045-fe.c
@@ -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;
 }