From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Linus Walleij <linus.walleij@linaro.org>,
Bartosz Golaszewski <bgolaszewski@baylibre.com>,
linux-gpio@vger.kernel.org
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Hans de Goede <hdegoede@redhat.com>,
Mika Westerberg <mika.westerberg@linux.intel.com>
Subject: [PATCH v6 03/18] gpiolib: move bias related code from gpio_set_config() to gpio_set_bias()
Date: Thu, 12 Nov 2020 00:05:44 +0200 [thread overview]
Message-ID: <20201111220559.39680-4-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <20201111220559.39680-1-andriy.shevchenko@linux.intel.com>
Move bias related code from gpio_set_config() to gpio_set_bias().
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>
---
drivers/gpio/gpiolib.c | 29 ++++++++++++++---------------
1 file changed, 14 insertions(+), 15 deletions(-)
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index 5210f396f0cd..2bfc44ca4425 100644
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -2107,25 +2107,13 @@ static int gpio_set_config_with_argument(struct gpio_desc *desc,
static int gpio_set_config(struct gpio_desc *desc, enum pin_config_param mode)
{
- unsigned int arg;
-
- switch (mode) {
- case PIN_CONFIG_BIAS_PULL_DOWN:
- case PIN_CONFIG_BIAS_PULL_UP:
- arg = 1;
- break;
-
- default:
- arg = 0;
- break;
- }
-
- return gpio_set_config_with_argument(desc, mode, arg);
+ return gpio_set_config_with_argument(desc, mode, 0);
}
static int gpio_set_bias(struct gpio_desc *desc)
{
enum pin_config_param bias;
+ unsigned int arg;
int ret;
if (test_bit(FLAG_BIAS_DISABLE, &desc->flags))
@@ -2137,7 +2125,18 @@ static int gpio_set_bias(struct gpio_desc *desc)
else
return 0;
- ret = gpio_set_config(desc, bias);
+ switch (bias) {
+ case PIN_CONFIG_BIAS_PULL_DOWN:
+ case PIN_CONFIG_BIAS_PULL_UP:
+ arg = 1;
+ break;
+
+ default:
+ arg = 0;
+ break;
+ }
+
+ ret = gpio_set_config_with_argument(desc, bias, arg);
if (ret != -ENOTSUPP)
return ret;
--
2.28.0
next prev parent reply other threads:[~2020-11-11 22:06 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-11 22:05 [PATCH v6 00/18] gpiolib: acpi: pin configuration fixes Andy Shevchenko
2020-11-11 22:05 ` [PATCH v6 01/18] gpiolib: use proper API to pack pin configuration parameters Andy Shevchenko
2020-11-11 22:05 ` [PATCH v6 02/18] gpiolib: Extract gpio_set_config_with_argument() for future use Andy Shevchenko
2020-11-11 22:05 ` Andy Shevchenko [this message]
2020-11-11 22:05 ` [PATCH v6 04/18] gpiolib: Extract gpio_set_config_with_argument_optional() helper Andy Shevchenko
2020-11-11 22:05 ` [PATCH v6 05/18] gpiolib: Introduce gpio_set_debounce_timeout() for internal use Andy Shevchenko
2020-11-11 22:05 ` [PATCH v6 06/18] gpiolib: acpi: Respect bias settings for GpioInt() resource Andy Shevchenko
2020-11-11 22:05 ` [PATCH v6 07/18] gpiolib: acpi: Use named item for enum gpiod_flags variable Andy Shevchenko
2020-11-11 22:05 ` [PATCH v6 08/18] gpiolib: acpi: Take into account debounce settings Andy Shevchenko
2020-11-11 22:05 ` [PATCH v6 09/18] gpiolib: acpi: Move non-critical code outside of critical section Andy Shevchenko
2020-11-11 22:05 ` [PATCH v6 10/18] gpiolib: acpi: Move acpi_gpio_to_gpiod_flags() upper in the code Andy Shevchenko
2020-11-11 22:05 ` [PATCH v6 11/18] gpiolib: acpi: Set initial value for output pin based on bias and polarity Andy Shevchenko
2020-11-11 22:05 ` [PATCH v6 12/18] gpiolib: acpi: Make acpi_gpio_to_gpiod_flags() usable for GpioInt() Andy Shevchenko
2020-11-11 22:05 ` [PATCH v6 13/18] gpiolib: acpi: Extract acpi_request_own_gpiod() helper Andy Shevchenko
2020-11-11 22:05 ` [PATCH v6 14/18] gpiolib: acpi: Convert pin_index to be u16 Andy Shevchenko
2020-11-11 22:05 ` [PATCH v6 15/18] gpiolib: acpi: Use BIT() macro to increase readability Andy Shevchenko
2020-11-11 22:05 ` [PATCH v6 16/18] gpiolib: acpi: Make Intel GPIO tree official for GPIO ACPI work Andy Shevchenko
2020-11-11 22:05 ` [PATCH v6 17/18] sh: Drop ARCH_NR_GPIOS definition Andy Shevchenko
2020-11-11 22:11 ` Andy Shevchenko
2020-11-11 22:05 ` [PATCH v6 18/18] ARM: " Andy Shevchenko
2020-11-11 22:10 ` Andy Shevchenko
2020-11-11 22:09 ` [PATCH v6 00/18] gpiolib: acpi: pin configuration fixes Andy Shevchenko
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=20201111220559.39680-4-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=bgolaszewski@baylibre.com \
--cc=hdegoede@redhat.com \
--cc=linus.walleij@linaro.org \
--cc=linux-gpio@vger.kernel.org \
--cc=mika.westerberg@linux.intel.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;
as well as URLs for NNTP newsgroup(s).