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 v6 6/8] gpio: ws16c48: Utilize for_each_set_clump8 macro
Date: Wed, 19 Dec 2018 15:02:05 +0900 [thread overview]
Message-ID: <ea51e84de1e3d19f89a5607654c6db2a6abf0525.1545198260.git.vilhelm.gray@gmail.com> (raw)
In-Reply-To: <cover.1545198260.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-ws16c48.c | 71 ++++++++++---------------------------
1 file changed, 19 insertions(+), 52 deletions(-)
diff --git a/drivers/gpio/gpio-ws16c48.c b/drivers/gpio/gpio-ws16c48.c
index 5cf3697bfb15..b4c544d5da18 100644
--- a/drivers/gpio/gpio-ws16c48.c
+++ b/drivers/gpio/gpio-ws16c48.c
@@ -134,42 +134,19 @@ static int ws16c48_gpio_get_multiple(struct gpio_chip *chip,
unsigned long *mask, unsigned long *bits)
{
struct ws16c48_gpio *const ws16c48gpio = gpiochip_get_data(chip);
- const unsigned int gpio_reg_size = 8;
- size_t i;
- const size_t num_ports = chip->ngpio / gpio_reg_size;
- 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);
+ unsigned int offset;
+ unsigned long gpio_mask;
+ 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 < num_ports; i++) {
- /* gpio offset in bits array */
- bits_offset = i * gpio_reg_size;
+ for_each_set_clump8(offset, gpio_mask, mask, chip->ngpio) {
+ port_addr = ws16c48gpio->base + 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(ws16c48gpio->base + i);
-
- /* store acquired bits at respective bits array offset */
- bits[word_index] |= (port_state << word_offset) & word_mask;
+ bitmap_set_value8(bits, &port_state, offset);
}
return 0;
@@ -203,39 +180,29 @@ static void ws16c48_gpio_set_multiple(struct gpio_chip *chip,
unsigned long *mask, unsigned long *bits)
{
struct ws16c48_gpio *const ws16c48gpio = gpiochip_get_data(chip);
- unsigned int i;
- const unsigned int gpio_reg_size = 8;
- unsigned int port;
- unsigned int iomask;
+ unsigned int offset;
+ unsigned long gpio_mask;
+ size_t index;
+ unsigned int port_addr;
unsigned int bitmask;
unsigned long flags;
- /* set bits are evaluated a gpio register size at a time */
- for (i = 0; i < chip->ngpio; i += gpio_reg_size) {
- /* no more set bits in this mask word; skip to the next word */
- if (!mask[BIT_WORD(i)]) {
- i = (BIT_WORD(i) + 1) * BITS_PER_LONG - gpio_reg_size;
- continue;
- }
-
- port = i / gpio_reg_size;
+ for_each_set_clump8(offset, gpio_mask, mask, chip->ngpio) {
+ index = offset / 8;
+ port_addr = ws16c48gpio->base + index;
/* mask out GPIO configured for input */
- iomask = mask[BIT_WORD(i)] & ~ws16c48gpio->io_state[port];
- bitmask = iomask & bits[BIT_WORD(i)];
+ gpio_mask &= ~ws16c48gpio->io_state[index];
+ bitmask = bitmap_get_value8(bits, offset) & gpio_mask;
raw_spin_lock_irqsave(&ws16c48gpio->lock, flags);
/* update output state data and set device gpio register */
- ws16c48gpio->out_state[port] &= ~iomask;
- ws16c48gpio->out_state[port] |= bitmask;
- outb(ws16c48gpio->out_state[port], ws16c48gpio->base + port);
+ ws16c48gpio->out_state[index] &= ~gpio_mask;
+ ws16c48gpio->out_state[index] |= bitmask;
+ outb(ws16c48gpio->out_state[index], port_addr);
raw_spin_unlock_irqrestore(&ws16c48gpio->lock, flags);
-
- /* prepare for next gpio register set */
- mask[BIT_WORD(i)] >>= gpio_reg_size;
- bits[BIT_WORD(i)] >>= gpio_reg_size;
}
}
--
2.20.1
next prev parent reply other threads:[~2018-12-19 6:02 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-19 5:59 [PATCH v6 0/8] Introduce the for_each_set_clump8 macro William Breathitt Gray
2018-12-19 5:59 ` William Breathitt Gray
2018-12-19 6:00 ` [PATCH v6 1/8] bitops: " William Breathitt Gray
2018-12-19 6:00 ` William Breathitt Gray
2019-01-11 8:42 ` Linus Walleij
2019-01-11 8:42 ` Linus Walleij
2019-01-11 9:00 ` Rasmus Villemoes
2019-01-11 9:00 ` Rasmus Villemoes
2018-12-19 6:00 ` [PATCH v6 2/8] lib/test_bitmap.c: Add for_each_set_clump8 test cases William Breathitt Gray
2018-12-19 6:00 ` William Breathitt Gray
2019-01-02 8:45 ` [LKP] [lib/test_bitmap.c] 467e3fea0c: kernel_selftests.lib.bitmap.sh.fail kernel test robot
2018-12-19 6:01 ` [PATCH v6 3/8] gpio: 104-dio-48e: Utilize for_each_set_clump8 macro William Breathitt Gray
2018-12-19 6:01 ` William Breathitt Gray
2018-12-19 6:01 ` [PATCH v6 4/8] gpio: 104-idi-48: " William Breathitt Gray
2018-12-19 6:01 ` William Breathitt Gray
2018-12-19 6:01 ` [PATCH v6 5/8] gpio: gpio-mm: " William Breathitt Gray
2018-12-19 6:01 ` William Breathitt Gray
2018-12-19 6:02 ` William Breathitt Gray [this message]
2018-12-19 6:02 ` [PATCH v6 6/8] gpio: ws16c48: " William Breathitt Gray
2018-12-19 6:02 ` [PATCH v6 7/8] gpio: pci-idio-16: " William Breathitt Gray
2018-12-19 6:02 ` William Breathitt Gray
2018-12-19 6:02 ` [PATCH v6 8/8] gpio: pcie-idio-24: " William Breathitt Gray
2018-12-19 6:02 ` William Breathitt Gray
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=ea51e84de1e3d19f89a5607654c6db2a6abf0525.1545198260.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).