summaryrefslogtreecommitdiff
path: root/drivers/gpio
diff options
context:
space:
mode:
authorBartosz Golaszewski <bgolaszewski@baylibre.com>2017-02-06 13:10:36 +0100
committerLinus Walleij <linus.walleij@linaro.org>2017-02-06 14:21:13 +0100
commite4ba07bf8d1481e440d1f49652c96567f9560fdc (patch)
treed0a75c7baaf7cfb987e4d28231227a15e1d5692d /drivers/gpio
parentca4091607847d25778db1b701a6e14dcc87a55ff (diff)
gpio: mockup: code shrink
Moving a couple of lines around allows us to shrink the code a bit while keeping the same functionality. Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/gpio')
-rw-r--r--drivers/gpio/gpio-mockup.c29
1 files changed, 8 insertions, 21 deletions
diff --git a/drivers/gpio/gpio-mockup.c b/drivers/gpio/gpio-mockup.c
index 5f6ed4b24b75..d42560113c1b 100644
--- a/drivers/gpio/gpio-mockup.c
+++ b/drivers/gpio/gpio-mockup.c
@@ -92,7 +92,6 @@ static int gpio_mockup_add(struct device *dev,
const char *name, int base, int ngpio)
{
struct gpio_chip *gc = &chip->gc;
- int ret;
gc->base = base;
gc->ngpio = ngpio;
@@ -107,21 +106,10 @@ static int gpio_mockup_add(struct device *dev,
chip->lines = devm_kzalloc(dev, sizeof(*chip->lines) * gc->ngpio,
GFP_KERNEL);
- if (!chip->lines) {
- ret = -ENOMEM;
- goto err;
- }
-
- ret = devm_gpiochip_add_data(dev, &chip->gc, chip);
- if (ret)
- goto err;
-
- dev_info(dev, "gpio<%d..%d> add successful!", base, base + ngpio);
- return 0;
+ if (!chip->lines)
+ return -ENOMEM;
-err:
- dev_err(dev, "gpio<%d..%d> add failed!", base, base + ngpio);
- return ret;
+ return devm_gpiochip_add_data(dev, &chip->gc, chip);
}
static int gpio_mockup_probe(struct platform_device *pdev)
@@ -164,15 +152,14 @@ static int gpio_mockup_probe(struct platform_device *pdev)
}
if (ret) {
- if (base < 0)
- dev_err(dev, "gpio<%d..%d> add failed\n",
- base, ngpio);
- else
- dev_err(dev, "gpio<%d..%d> add failed\n",
- base, base + ngpio);
+ dev_err(dev, "gpio<%d..%d> add failed\n",
+ base, base < 0 ? ngpio : base + ngpio);
return ret;
}
+
+ dev_info(dev, "gpio<%d..%d> add successful!",
+ base, base + ngpio);
}
return 0;