From: Bartosz Golaszewski <brgl@bgdev.pl>
To: Kent Gibson <warthog618@gmail.com>,
Linus Walleij <linus.walleij@linaro.org>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Guenter Roeck <linux@roeck-us.net>,
Geert Uytterhoeven <geert@linux-m68k.org>
Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org,
Bartosz Golaszewski <bgolaszewski@baylibre.com>
Subject: [PATCH 2/3] Revert "gpiolib: remove set but not used variable 'config'"
Date: Mon, 3 Feb 2020 14:30:25 +0100 [thread overview]
Message-ID: <20200203133026.22930-3-brgl@bgdev.pl> (raw)
In-Reply-To: <20200203133026.22930-1-brgl@bgdev.pl>
From: Bartosz Golaszewski <bgolaszewski@baylibre.com>
This reverts commit e5e42ad224a040f93bf112e96f82b3a0ed97ffab.
This patch came on top of another patch that introduced a regression.
Revert it before addressing the culprit.
Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
---
drivers/gpio/gpiolib.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index 0673daeaca00..13982056c14e 100644
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -3047,6 +3047,7 @@ static int gpio_do_set_config(struct gpio_chip *gc, unsigned int offset,
static int gpio_set_config(struct gpio_chip *gc, unsigned int offset,
enum pin_config_param mode)
{
+ unsigned long config;
unsigned arg;
switch (mode) {
@@ -3060,6 +3061,7 @@ static int gpio_set_config(struct gpio_chip *gc, unsigned int offset,
arg = 0;
}
+ config = PIN_CONF_PACKED(mode, arg);
return gpio_do_set_config(gc, offset, mode);
}
--
2.23.0
next prev parent reply other threads:[~2020-02-03 13:30 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-03 13:30 [PATCH 0/3] gpiolib: fix a regression introduced by gpio_do_set_config() Bartosz Golaszewski
2020-02-03 13:30 ` [PATCH 1/3] Revert "gpiolib: Remove duplicated function gpio_do_set_config()" Bartosz Golaszewski
2020-02-03 13:30 ` Bartosz Golaszewski [this message]
2020-02-03 13:30 ` [PATCH 3/3] gpiolib: fix gpio_do_set_config() Bartosz Golaszewski
2020-02-03 14:31 ` [PATCH 0/3] gpiolib: fix a regression introduced by gpio_do_set_config() Andy Shevchenko
2020-02-03 14:35 ` Bartosz Golaszewski
2020-02-03 14:56 ` Andy Shevchenko
2020-02-03 19:14 ` Guenter Roeck
2020-02-04 9:46 ` 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=20200203133026.22930-3-brgl@bgdev.pl \
--to=brgl@bgdev.pl \
--cc=andriy.shevchenko@linux.intel.com \
--cc=bgolaszewski@baylibre.com \
--cc=geert@linux-m68k.org \
--cc=gregkh@linuxfoundation.org \
--cc=linus.walleij@linaro.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=warthog618@gmail.com \
/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