ptp: vmclock: Remove goto-based cleanup logic

vmclock_probe() uses an "out:" label to return from the function on
error. This indicates that some cleanup operation is necessary.
However the label does not do anything as all resources are managed
through devres, making the code slightly harder to read.

Remove the label and just return directly.

Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
Acked-by: Richard Cochran <richardcochran@gmail.com>
Reviewed-by: David Woodhouse <dwmw@amazon.co.uk>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
(cherry picked from commit b4c1fde5ced93d9f4ad89e2c940d3fd56ad82288)

diff --git a/ptp_vmclock.c b/ptp_vmclock.c
index efe5d0650ac8ec8075b55290501c407714e6714f..167820913f57ef3c760951c327270f6659d4bc5d 100644 (file)
--- a/ptp_vmclock.c
+++ b/ptp_vmclock.c
@@ -520,14 +520,13 @@ static int vmclock_probe(struct platform_device *pdev)
 
        if (ret) {
                dev_info(dev, "Failed to obtain physical address: %d\n", ret);
-               goto out;
+               return ret;
        }
 
        if (resource_size(&st->res) < VMCLOCK_MIN_SIZE) {
                dev_info(dev, "Region too small (0x%llx)\n",
                         resource_size(&st->res));
-               ret = -EINVAL;
-               goto out;
+               return -EINVAL;
        }
        st->clk = devm_memremap(dev, st->res.start, resource_size(&st->res),
                                MEMREMAP_WB | MEMREMAP_DEC);
@@ -535,37 +534,34 @@ static int vmclock_probe(struct platform_device *pdev)
                ret = PTR_ERR(st->clk);
                dev_info(dev, "failed to map shared memory\n");
                st->clk = NULL;
-               goto out;
+               return ret;
        }
 
        if (le32_to_cpu(st->clk->magic) != VMCLOCK_MAGIC ||
            le32_to_cpu(st->clk->size) > resource_size(&st->res) ||
            le16_to_cpu(st->clk->version) != 1) {
                dev_info(dev, "vmclock magic fields invalid\n");
-               ret = -EINVAL;
-               goto out;
+               return -EINVAL;
        }
 
        ret = ida_alloc(&vmclock_ida, GFP_KERNEL);
        if (ret < 0)
-               goto out;
+               return ret;
 
        st->index = ret;
        ret = devm_add_action_or_reset(&pdev->dev, vmclock_put_idx, st);
        if (ret)
-               goto out;
+               return ret;
 
        st->name = devm_kasprintf(&pdev->dev, GFP_KERNEL, "vmclock%d", st->index);
-       if (!st->name) {
-               ret = -ENOMEM;
-               goto out;
-       }
+       if (!st->name)
+               return -ENOMEM;
 
        st->miscdev.minor = MISC_DYNAMIC_MINOR;
 
        ret = devm_add_action_or_reset(&pdev->dev, vmclock_remove, st);
        if (ret)
-               goto out;
+               return ret;
 
        /*
         * If the structure is big enough, it can be mapped to userspace.
@@ -579,7 +575,7 @@ static int vmclock_probe(struct platform_device *pdev)
 
                ret = misc_register(&st->miscdev);
                if (ret)
-                       goto out;
+                       return ret;
        }
 
        /* If there is valid clock information, register a PTP clock */
@@ -589,15 +585,14 @@ static int vmclock_probe(struct platform_device *pdev)
                if (IS_ERR(st->ptp_clock)) {
                        ret = PTR_ERR(st->ptp_clock);
                        st->ptp_clock = NULL;
-                       goto out;
+                       return ret;
                }
        }
 
        if (!st->miscdev.minor && !st->ptp_clock) {
                /* Neither miscdev nor PTP registered */
                dev_info(dev, "vmclock: Neither miscdev nor PTP available; not registering\n");
-               ret = -ENODEV;
-               goto out;
+               return -ENODEV;
        }
 
        dev_info(dev, "%s: registered %s%s%s\n", st->name,
@@ -605,8 +600,7 @@ static int vmclock_probe(struct platform_device *pdev)
                 (st->miscdev.minor && st->ptp_clock) ? ", " : "",
                 st->ptp_clock ? "PTP" : "");
 
- out:
-       return ret;
+       return 0;
 }
 
 static const struct acpi_device_id vmclock_acpi_ids[] = {