mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Andrey Smirnov <andrew.smirnov@gmail.com>
To: barebox@lists.infradead.org
Cc: Andrey Smirnov <andrew.smirnov@gmail.com>
Subject: [PATCH v2 02/11] gpiolib: Simplify code of gpio_request_one()
Date: Wed, 26 Jul 2017 09:31:11 -0700	[thread overview]
Message-ID: <20170726163120.25952-3-andrew.smirnov@gmail.com> (raw)
In-Reply-To: <20170726163120.25952-1-andrew.smirnov@gmail.com>

Looks like we can get rid of an 'if' and 'goto', so do it to simplify
the code.

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
---
 drivers/gpio/gpiolib.c | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index d081e02fd..67d771bae 100644
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -119,6 +119,7 @@ void gpio_free(unsigned gpio)
 int gpio_request_one(unsigned gpio, unsigned long flags, const char *label)
 {
 	int err;
+	struct gpio_info *gi = gpio_to_desc(gpio);
 
 	/*
 	 * Not all of the flags below are mulit-bit, but, for the sake
@@ -134,10 +135,7 @@ int gpio_request_one(unsigned gpio, unsigned long flags, const char *label)
 	if (err)
 		return err;
 
-	if (active_low) {
-		struct gpio_info *gi = gpio_to_desc(gpio);
-		gi->active_low = true;
-	}
+	gi->active_low = active_low;
 
 	if (dir_in)
 		err = gpio_direction_input(gpio);
@@ -147,12 +145,8 @@ int gpio_request_one(unsigned gpio, unsigned long flags, const char *label)
 		err = gpio_direction_output(gpio, init_high);
 
 	if (err)
-		goto free_gpio;
-
-	return 0;
+		gpio_free(gpio);
 
- free_gpio:
-	gpio_free(gpio);
 	return err;
 }
 EXPORT_SYMBOL_GPL(gpio_request_one);
-- 
2.13.3


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  parent reply	other threads:[~2017-07-26 16:31 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-07-26 16:31 [PATCH v2 00/11] i.MX7 SabreSD support Andrey Smirnov
2017-07-26 16:31 ` [PATCH v2 01/11] gpiolib: Fix buggy flag detection code Andrey Smirnov
2017-07-26 16:31 ` Andrey Smirnov [this message]
2017-07-26 16:31 ` [PATCH v2 03/11] clk: i.MX7: Remove unused UART clocks array Andrey Smirnov
2017-07-26 16:31 ` [PATCH v2 04/11] ARM: i.MX: Import mx7d_pins.h from U-Boot Andrey Smirnov
2017-07-26 16:31 ` [PATCH v2 05/11] ARM: i.MX: Add mx7_setup_pad() Andrey Smirnov
2017-07-26 16:31 ` [PATCH v2 06/11] ARM: i.MX: Add imx7_uart_setup_ll() Andrey Smirnov
2017-07-26 16:31 ` [PATCH v2 07/11] ARM: i.MX: Add minimal imx7-ccm-regs.h Andrey Smirnov
2017-07-26 16:31 ` [PATCH v2 08/11] ARM: i.MX: Add ARCH_HAD_FEC_IMX to ARCH_IMX7 Andrey Smirnov
2017-07-26 16:31 ` [PATCH v2 09/11] ARM: i.MX: Import imx7-iomuxc-gpr.h from Linux kernel Andrey Smirnov
2017-07-26 16:31 ` [PATCH v2 10/11] include: Add phy-id-list.h Andrey Smirnov
2017-07-26 16:31 ` [PATCH v2 11/11] ARM: i.MX: Add support for NXP i.MX7 SABRESD board Andrey Smirnov
2017-07-26 16:55   ` Sam Ravnborg
2017-07-26 16:56 ` [PATCH v2 00/11] i.MX7 SabreSD support Sam Ravnborg

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=20170726163120.25952-3-andrew.smirnov@gmail.com \
    --to=andrew.smirnov@gmail.com \
    --cc=barebox@lists.infradead.org \
    /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