linux-gpio.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Bartosz Golaszewski <bgolaszewski@baylibre.com>
To: Linus Walleij <linus.walleij@linaro.org>,
	Alexandre Courbot <gnurou@gmail.com>,
	Bamvor Jian Zhang <bamvor.zhangjian@linaro.org>,
	Thomas Gleixner <tglx@linutronix.de>
Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org,
	Bartosz Golaszewski <bgolaszewski@baylibre.com>
Subject: [PATCH v2 2/7] gpio: mockup: code shrink
Date: Mon,  6 Feb 2017 13:10:36 +0100	[thread overview]
Message-ID: <1486383041-16758-3-git-send-email-bgolaszewski@baylibre.com> (raw)
In-Reply-To: <1486383041-16758-1-git-send-email-bgolaszewski@baylibre.com>

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

  parent reply	other threads:[~2017-02-06 12:10 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-02-06 12:10 [PATCH v2 0/7] gpio: mockup: extensions for testing purposes Bartosz Golaszewski
2017-02-06 12:10 ` [PATCH v2 1/7] gpio: mockup: readability tweaks Bartosz Golaszewski
2017-02-06 13:20   ` Linus Walleij
2017-02-06 12:10 ` Bartosz Golaszewski [this message]
2017-02-06 13:21   ` [PATCH v2 2/7] gpio: mockup: code shrink Linus Walleij
2017-02-06 12:10 ` [PATCH v2 3/7] gpio: mockup: implement naming the lines Bartosz Golaszewski
2017-02-06 13:22   ` Linus Walleij
2017-02-06 12:10 ` [PATCH v2 4/7] irqdesc: add memory managed version of irq_alloc_descs() Bartosz Golaszewski
2017-02-06 13:26   ` Linus Walleij
2017-02-06 12:10 ` [PATCH v2 5/7] gpio: mockup: add a dummy irqchip Bartosz Golaszewski
2017-02-06 13:29   ` Linus Walleij
2017-02-06 13:31     ` Bartosz Golaszewski
2017-02-06 13:41       ` Linus Walleij
2017-02-06 12:10 ` [PATCH v2 6/7] gpiolib: include <gpio/consumer.h> from gpiolib.h Bartosz Golaszewski
2017-02-06 13:30   ` Linus Walleij
2017-02-06 12:10 ` [PATCH v2 7/7] gpio: mockup: implement event injecting over debugfs Bartosz Golaszewski
2017-02-06 12:12 ` [PATCH v2 0/7] gpio: mockup: extensions for testing purposes Bartosz Golaszewski

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1486383041-16758-3-git-send-email-bgolaszewski@baylibre.com \
    --to=bgolaszewski@baylibre.com \
    --cc=bamvor.zhangjian@linaro.org \
    --cc=gnurou@gmail.com \
    --cc=linus.walleij@linaro.org \
    --cc=linux-gpio@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=tglx@linutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).