From: William Breathitt Gray <vilhelm.gray@gmail.com>
To: linus.walleij@linaro.org
Cc: akpm@linux-foundation.org, linux-gpio@vger.kernel.org,
linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org,
andriy.shevchenko@linux.intel.com, linux@rasmusvillemoes.dk,
William Breathitt Gray <vilhelm.gray@gmail.com>
Subject: [PATCH v8 4/8] gpio: 104-idi-48: Utilize for_each_set_clump8 macro
Date: Mon, 14 Jan 2019 15:20:44 +0900 [thread overview]
Message-ID: <fa5f30ee2cc69a3432405c5ffa0c5e8a10a46100.1547445576.git.vilhelm.gray@gmail.com> (raw)
In-Reply-To: <cover.1547445576.git.vilhelm.gray@gmail.com>
Replace verbose implementation in get_multiple/set_multiple callbacks
with for_each_set_clump8 macro to simplify code and improve clarity.
Signed-off-by: William Breathitt Gray <vilhelm.gray@gmail.com>
---
drivers/gpio/gpio-104-idi-48.c | 37 ++++++++--------------------------
1 file changed, 8 insertions(+), 29 deletions(-)
diff --git a/drivers/gpio/gpio-104-idi-48.c b/drivers/gpio/gpio-104-idi-48.c
index 88dc6f2449f6..59c571aecf9a 100644
--- a/drivers/gpio/gpio-104-idi-48.c
+++ b/drivers/gpio/gpio-104-idi-48.c
@@ -93,42 +93,21 @@ static int idi_48_gpio_get_multiple(struct gpio_chip *chip, unsigned long *mask,
unsigned long *bits)
{
struct idi_48_gpio *const idi48gpio = gpiochip_get_data(chip);
- size_t i;
+ unsigned int offset;
+ unsigned long gpio_mask;
static const size_t ports[] = { 0, 1, 2, 4, 5, 6 };
- const unsigned int gpio_reg_size = 8;
- unsigned int bits_offset;
- size_t word_index;
- unsigned int word_offset;
- unsigned long word_mask;
- const unsigned long port_mask = GENMASK(gpio_reg_size - 1, 0);
+ const unsigned int ngpio = ARRAY_SIZE(ports) * 8;
+ unsigned int port_addr;
unsigned long port_state;
/* clear bits array to a clean slate */
bitmap_zero(bits, chip->ngpio);
- /* get bits are evaluated a gpio port register at a time */
- for (i = 0; i < ARRAY_SIZE(ports); i++) {
- /* gpio offset in bits array */
- bits_offset = i * gpio_reg_size;
+ for_each_set_clump8(offset, gpio_mask, mask, ngpio) {
+ port_addr = idi48gpio->base + ports[offset / 8];
+ port_state = inb(port_addr) & gpio_mask;
- /* word index for bits array */
- word_index = BIT_WORD(bits_offset);
-
- /* gpio offset within current word of bits array */
- word_offset = bits_offset % BITS_PER_LONG;
-
- /* mask of get bits for current gpio within current word */
- word_mask = mask[word_index] & (port_mask << word_offset);
- if (!word_mask) {
- /* no get bits in this port so skip to next one */
- continue;
- }
-
- /* read bits from current gpio port */
- port_state = inb(idi48gpio->base + ports[i]);
-
- /* store acquired bits at respective bits array offset */
- bits[word_index] |= (port_state << word_offset) & word_mask;
+ bitmap_set_value8(bits, ngpio, port_state, offset);
}
return 0;
--
2.20.1
next prev parent reply other threads:[~2019-01-14 6:20 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-14 6:19 [PATCH v8 0/8] Introduce the for_each_set_clump8 macro William Breathitt Gray
2019-01-14 6:19 ` [PATCH v8 1/8] bitops: " William Breathitt Gray
2019-01-14 6:20 ` [PATCH v8 2/8] lib/test_bitmap.c: Add for_each_set_clump8 test cases William Breathitt Gray
2019-01-14 6:20 ` [PATCH v8 3/8] gpio: 104-dio-48e: Utilize for_each_set_clump8 macro William Breathitt Gray
2019-01-14 6:20 ` William Breathitt Gray [this message]
2019-01-14 6:21 ` [PATCH v8 5/8] gpio: gpio-mm: " William Breathitt Gray
2019-01-14 6:21 ` [PATCH v8 6/8] gpio: ws16c48: " William Breathitt Gray
2019-01-14 6:21 ` [PATCH v8 7/8] gpio: pci-idio-16: " William Breathitt Gray
2019-01-14 6:22 ` [PATCH v8 8/8] gpio: pcie-idio-24: " William Breathitt Gray
2019-01-30 1:07 ` [PATCH v8 0/8] Introduce the " Andrew Morton
2019-01-30 9:44 ` Linus Walleij
2019-01-30 10:18 ` William Breathitt Gray
2019-01-30 11:56 ` Linus Walleij
2019-02-08 16:39 ` 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=fa5f30ee2cc69a3432405c5ffa0c5e8a10a46100.1547445576.git.vilhelm.gray@gmail.com \
--to=vilhelm.gray@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=andriy.shevchenko@linux.intel.com \
--cc=linus.walleij@linaro.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@rasmusvillemoes.dk \
/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).