gpio: pca953x: Get rid of useless goto label

In a few functions goto label is useless as there are no locking,
no nothing that may justify its usage. Get rid of it.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>

diff --git a/drivers/gpio/gpio-pca953x.c b/drivers/gpio/gpio-pca953x.c
index bf27e2d920f7e724f9ca330b56b0fb8a60705bf1..16f5e3043bf00f190c31d6de5667fc6f1e402eae 100644 (file)
--- a/drivers/gpio/gpio-pca953x.c
+++ b/drivers/gpio/gpio-pca953x.c
@@ -988,20 +988,18 @@ static int device_pca95xx_init(struct pca953x_chip *chip)
        ret = regcache_sync_region(chip->regmap, regaddr,
                                   regaddr + NBANK(chip) - 1);
        if (ret)
-               goto out;
+               return ret;
 
        regaddr = chip->recalc_addr(chip, chip->regs->direction, 0);
        ret = regcache_sync_region(chip->regmap, regaddr,
                                   regaddr + NBANK(chip) - 1);
        if (ret)
-               goto out;
+               return ret;
 
        /* clear polarity inversion */
        bitmap_zero(val, MAX_LINE);
 
-       ret = pca953x_write_regs(chip, chip->regs->invert, val);
-out:
-       return ret;
+       return pca953x_write_regs(chip, chip->regs->invert, val);
 }
 
 static int device_pca957x_init(struct pca953x_chip *chip)
@@ -1012,19 +1010,13 @@ static int device_pca957x_init(struct pca953x_chip *chip)
 
        ret = device_pca95xx_init(chip);
        if (ret)
-               goto out;
+               return ret;
 
        /* To enable register 6, 7 to control pull up and pull down */
        for (i = 0; i < NBANK(chip); i++)
                bitmap_set_value8(val, 0x02, i * BANK_SZ);
 
-       ret = pca953x_write_regs(chip, PCA957X_BKEN, val);
-       if (ret)
-               goto out;
-
-       return 0;
-out:
-       return ret;
+       return pca953x_write_regs(chip, PCA957X_BKEN, val);
 }
 
 static void pca953x_disable_regulator(void *reg)
@@ -1262,12 +1254,10 @@ static int pca953x_resume(struct device *dev)
        }
 
        ret = pca953x_restore_context(chip);
-       if (ret) {
+       if (ret)
                dev_err(dev, "Failed to restore register map: %d\n", ret);
-               return ret;
-       }
 
-       return 0;
+       return ret;
 }
 
 static DEFINE_SIMPLE_DEV_PM_OPS(pca953x_pm_ops, pca953x_suspend, pca953x_resume);