mtd: powernv_flash: Remove pointless goto in driver init

powernv_flash_probe() has pointless goto statements which jump to the
end of the function to simply return a variable. Rather than checking
for error and going to the label, just return the error as soon as it is
detected.

Signed-off-by: Cyril Bur <cyrilbur@gmail.com>
Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

diff --git a/drivers/mtd/devices/powernv_flash.c b/drivers/mtd/devices/powernv_flash.c
index ca3ca6a..4dd3b5d 100644 (file)
--- a/drivers/mtd/devices/powernv_flash.c
+++ b/drivers/mtd/devices/powernv_flash.c
@@ -227,21 +227,20 @@ static int powernv_flash_probe(struct platform_device *pdev)
        int ret;
 
        data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL);
-       if (!data) {
-               ret = -ENOMEM;
-               goto out;
-       }
+       if (!data)
+               return -ENOMEM;
+
        data->mtd.priv = data;
 
        ret = of_property_read_u32(dev->of_node, "ibm,opal-id", &(data->id));
        if (ret) {
                dev_err(dev, "no device property 'ibm,opal-id'\n");
-               goto out;
+               return ret;
        }
 
        ret = powernv_flash_set_driver_info(dev, &data->mtd);
        if (ret)
-               goto out;
+               return ret;
 
        dev_set_drvdata(dev, data);
 
@@ -250,10 +249,7 @@ static int powernv_flash_probe(struct platform_device *pdev)
         * with an ffs partition at the start, it should prove easier for users
         * to deal with partitions or not as they see fit
         */
-       ret = mtd_device_register(&data->mtd, NULL, 0);
-
-out:
-       return ret;
+       return mtd_device_register(&data->mtd, NULL, 0);
 }
 
 /**