linux-gpio.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Mika Westerberg <mika.westerberg@linux.intel.com>,
	linux-gpio@vger.kernel.org,
	Linus Walleij <linus.walleij@linaro.org>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Subject: [PATCH v1 09/10] pinctrl: intel: Make use of for_each_requested_gpio()
Date: Wed, 10 Jun 2020 21:35:42 +0300	[thread overview]
Message-ID: <20200610183543.89414-9-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <20200610183543.89414-1-andriy.shevchenko@linux.intel.com>

Make use of for_each_requested_gpio() instead of home grown analogue.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 drivers/pinctrl/intel/pinctrl-intel.c | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/drivers/pinctrl/intel/pinctrl-intel.c b/drivers/pinctrl/intel/pinctrl-intel.c
index 7e25e20293a8..ef4bbd72c9a9 100644
--- a/drivers/pinctrl/intel/pinctrl-intel.c
+++ b/drivers/pinctrl/intel/pinctrl-intel.c
@@ -1628,19 +1628,6 @@ static void intel_gpio_irq_init(struct intel_pinctrl *pctrl)
 	}
 }
 
-static u32
-intel_gpio_is_requested(struct gpio_chip *chip, int base, unsigned int size)
-{
-	u32 requested = 0;
-	unsigned int i;
-
-	for (i = 0; i < size; i++)
-		if (gpiochip_is_requested(chip, base + i))
-			requested |= BIT(i);
-
-	return requested;
-}
-
 static bool intel_gpio_update_reg(void __iomem *reg, u32 mask, u32 value)
 {
 	u32 curr, updated;
@@ -1661,12 +1648,15 @@ static void intel_restore_hostown(struct intel_pinctrl *pctrl, unsigned int c,
 	const struct intel_community *community = &pctrl->communities[c];
 	const struct intel_padgroup *padgrp = &community->gpps[gpp];
 	struct device *dev = pctrl->dev;
-	u32 requested;
+	u32 requested = 0;
+	unsigned int i;
 
 	if (padgrp->gpio_base == INTEL_GPIO_BASE_NOMAP)
 		return;
 
-	requested = intel_gpio_is_requested(&pctrl->chip, padgrp->gpio_base, padgrp->size);
+	for_each_requested_gpio(&pctrl->chip, i, padgrp->gpio_base, padgrp->size)
+		requested |= BIT(i);
+
 	if (!intel_gpio_update_reg(base + gpp * 4, requested, saved))
 		return;
 
-- 
2.27.0.rc2


  parent reply	other threads:[~2020-06-10 18:35 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-06-10 18:35 [PATCH v1 01/10] pinctrl: intel: Disable input and output buffer when switching to GPIO Andy Shevchenko
2020-06-10 18:35 ` [PATCH v1 02/10] pinctrl: intel: Reduce scope of the lock Andy Shevchenko
2020-06-10 18:35 ` [PATCH v1 03/10] pinctrl: intel: Make use of IRQ_RETVAL() Andy Shevchenko
2020-06-10 18:35 ` [PATCH v1 04/10] pinctrl: intel: Split intel_config_get() to three functions Andy Shevchenko
2020-06-10 18:35 ` [PATCH v1 05/10] pinctrl: intel: Get rid of redundant 'else' in intel_config_set_debounce() Andy Shevchenko
2020-06-10 18:35 ` [PATCH v1 06/10] pinctrl: intel: Drop the only label in the code for consistency Andy Shevchenko
2020-06-10 18:35 ` [PATCH v1 07/10] pinctrl: intel: Protect IO in few call backs by lock Andy Shevchenko
2020-06-10 18:35 ` [PATCH v1 08/10] pinctrl: intel: Introduce for_each_requested_gpio() macro Andy Shevchenko
2020-06-10 18:35 ` Andy Shevchenko [this message]
2020-06-10 18:35 ` [PATCH v1 10/10] pinctrl: lynxpoint: Make use of for_each_requested_gpio() Andy Shevchenko
2020-06-12 14:33 ` [PATCH v1 01/10] pinctrl: intel: Disable input and output buffer when switching to GPIO 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=20200610183543.89414-9-andriy.shevchenko@linux.intel.com \
    --to=andriy.shevchenko@linux.intel.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).