[media] rc: Make probe cleanup goto labels more verbose

Before, labels were simply numbered. Now, the labels are named after the
cleanup action they'll perform (first), based on how the winbond-cir
driver does it. This makes the code a bit more clear and makes changes
in the ordering of labels easier to review.
This change is applied only to the rc drivers that do significant
cleanup in their probe functions: ati-remote, ene-ir, fintek-cir,
gpio-ir-recv, ite-cir, nuvoton-cir.
This commit should not change any code, it just renames goto labels.

[mchehab@redhat.com: removed changes at gpio-ir-recv.c, due to
 merge conflicts]

Signed-off-by: Matthijs Kooijman <matthijs@stdin.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 9 insertions, 9 deletions

diff --git a/drivers/media/rc/ite-cir.c b/drivers/media/rc/ite-cir.c
index 5e5a7f2b8184..8e0e661b5ef9 100644
--- a/drivers/media/rc/ite-cir.c
+++ b/drivers/media/rc/ite-cir.c
@@ -1472,7 +1472,7 @@ static int ite_probe(struct pnp_dev *pdev, const struct pnp_device_id
         /* input device for IR remote (and tx) */
         rdev = rc_allocate_device();
         if (!rdev)
-                goto failure;
+                goto exit_free_dev_rdev;
         itdev->rdev = rdev;
 
         ret = -ENODEV;
@@ -1498,12 +1498,12 @@ static int ite_probe(struct pnp_dev *pdev, const struct pnp_device_id
         if (!pnp_port_valid(pdev, io_rsrc_no) ||
             pnp_port_len(pdev, io_rsrc_no) != dev_desc->io_region_size) {
                 dev_err(&pdev->dev, "IR PNP Port not valid!\n");
-                goto failure;
+                goto exit_free_dev_rdev;
         }
 
         if (!pnp_irq_valid(pdev, 0)) {
                 dev_err(&pdev->dev, "PNP IRQ not valid!\n");
-                goto failure;
+                goto exit_free_dev_rdev;
         }
 
         /* store resource values */
@@ -1595,25 +1595,25 @@ static int ite_probe(struct pnp_dev *pdev, const struct pnp_device_id
         /* now claim resources */
         if (!request_region(itdev->cir_addr,
                                 dev_desc->io_region_size, ITE_DRIVER_NAME))
-                goto failure;
+                goto exit_free_dev_rdev;
 
         if (request_irq(itdev->cir_irq, ite_cir_isr, IRQF_SHARED,
                         ITE_DRIVER_NAME, (void *)itdev))
-                goto failure2;
+                goto exit_release_cir_addr;
 
         ret = rc_register_device(rdev);
         if (ret)
-                goto failure3;
+                goto exit_free_irq;
 
         ite_pr(KERN_NOTICE, "driver has been successfully loaded\n");
 
         return 0;
 
-failure3:
+exit_free_irq:
         free_irq(itdev->cir_irq, itdev);
-failure2:
+exit_release_cir_addr:
         release_region(itdev->cir_addr, itdev->params.io_region_size);
-failure:
+exit_free_dev_rdev:
         rc_free_device(rdev);
         kfree(itdev);