mfd: twl-core: Refactoring for add_numbered_child()

Adjust jump targets according to the Linux coding style convention.
Another check for the variable "status" can be omitted then at the end.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Signed-off-by: Lee Jones <lee.jones@linaro.org>

1 files changed, 11 insertions, 10 deletions

diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c
index 9458c6df39ed..a49d3db6d936 100644
--- a/drivers/mfd/twl-core.c
+++ b/drivers/mfd/twl-core.c
@@ -631,7 +631,7 @@ add_numbered_child(unsigned mod_no, const char *name, int num,
                 status = platform_device_add_data(pdev, pdata, pdata_len);
                 if (status < 0) {
                         dev_dbg(&pdev->dev, "can't add platform_data\n");
-                        goto err;
+                        goto put_device;
                 }
         }
 
@@ -644,21 +644,22 @@ add_numbered_child(unsigned mod_no, const char *name, int num,
                 status = platform_device_add_resources(pdev, r, irq1 ? 2 : 1);
                 if (status < 0) {
                         dev_dbg(&pdev->dev, "can't add irqs\n");
-                        goto err;
+                        goto put_device;
                 }
         }
 
         status = platform_device_add(pdev);
-        if (status == 0)
-                device_init_wakeup(&pdev->dev, can_wakeup);
+        if (status)
+                goto put_device;
+
+        device_init_wakeup(&pdev->dev, can_wakeup);
 
-err:
-        if (status < 0) {
-                platform_device_put(pdev);
-                dev_err(&twl->client->dev, "can't add %s dev\n", name);
-                return ERR_PTR(status);
-        }
         return &pdev->dev;
+
+put_device:
+        platform_device_put(pdev);
+        dev_err(&twl->client->dev, "failed to add device %s\n", name);
+        return ERR_PTR(status);
 }
 
 static inline struct device *add_child(unsigned mod_no, const char *name,