Messages in this thread Patch in this message | | | From | Bartosz Golaszewski <> | Subject | [PATCH v2 2/7] gpio: mockup: code shrink | Date | Mon, 6 Feb 2017 13:10:36 +0100 |
| |
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> --- drivers/gpio/gpio-mockup.c | 29 ++++++++--------------------- 1 file changed, 8 insertions(+), 21 deletions(-)
diff --git a/drivers/gpio/gpio-mockup.c b/drivers/gpio/gpio-mockup.c index 5f6ed4b..d425601 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; -- 2.9.3
| |