The patch titled
Subject: gpio: 104-idi-48: utilize for_each_set_clump8 macro
has been added to the -mm tree. Its filename is
gpio-104-idi-48-utilize-for_each_set_clump8-macro.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/gpio-104-idi-48-utilize-for_each_set_clump8-macro.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/gpio-104-idi-48-utilize-for_each_set_clump8-macro.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: William Breathitt Gray <vilhelm.gray@xxxxxxxxx>
Subject: gpio: 104-idi-48: utilize for_each_set_clump8 macro
Replace verbose implementation in get_multiple/set_multiple callbacks with
for_each_set_clump8 macro to simplify code and improve clarity.
Link: http://lkml.kernel.org/r/b0631b6d489f85008480399df283ccd33ecfe310.1570641097.git.vilhelm.gray@xxxxxxxxx
Signed-off-by: William Breathitt Gray <vilhelm.gray@xxxxxxxxx>
Reviewed-by: Linus Walleij <linus.walleij@xxxxxxxxxx>
Cc: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
Cc: Andy Shevchenko <andy.shevchenko@xxxxxxxxx>
Cc: Arnd Bergmann <arnd@xxxxxxxx>
Cc: Bartosz Golaszewski <bgolaszewski@xxxxxxxxxxxx>
Cc: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
Cc: Geert Uytterhoeven <geert+renesas@xxxxxxxxx>
Cc: Lukas Wunner <lukas@xxxxxxxxx>
Cc: Masahiro Yamada <yamada.masahiro@xxxxxxxxxxxxx>
Cc: Mathias Duckeck <m.duckeck@xxxxxxxxx>
Cc: Morten Hein Tiljeset <morten.tiljeset@xxxxxxxxx>
Cc: Phil Reid <preid@xxxxxxxxxxxxxxxxx>
Cc: Rasmus Villemoes <linux@xxxxxxxxxxxxxxxxxx>
Cc: Sean Nyekjaer <sean.nyekjaer@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/gpio/gpio-104-idi-48.c | 36 ++++++-------------------------
1 file changed, 7 insertions(+), 29 deletions(-)
--- a/drivers/gpio/gpio-104-idi-48.c~gpio-104-idi-48-utilize-for_each_set_clump8-macro
+++ a/drivers/gpio/gpio-104-idi-48.c
@@ -85,42 +85,20 @@ static int idi_48_gpio_get_multiple(stru
unsigned long *bits)
{
struct idi_48_gpio *const idi48gpio = gpiochip_get_data(chip);
- size_t i;
+ unsigned long 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);
+ 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, ARRAY_SIZE(ports) * 8) {
+ 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, port_state, offset);
}
return 0;
_
Patches currently in -mm which might be from vilhelm.gray@xxxxxxxxx are
bitops-introduce-the-for_each_set_clump8-macro.patch
lib-test_bitmapc-add-for_each_set_clump8-test-cases.patch
gpio-104-dio-48e-utilize-for_each_set_clump8-macro.patch
gpio-104-idi-48-utilize-for_each_set_clump8-macro.patch
gpio-gpio-mm-utilize-for_each_set_clump8-macro.patch
gpio-ws16c48-utilize-for_each_set_clump8-macro.patch
gpio-pci-idio-16-utilize-for_each_set_clump8-macro.patch
gpio-pcie-idio-24-utilize-for_each_set_clump8-macro.patch
gpio-uniphier-utilize-for_each_set_clump8-macro.patch
gpio-74x164-utilize-the-for_each_set_clump8-macro.patch
thermal-intel-intel_soc_dts_iosf-utilize-for_each_set_clump8-macro.patch
gpio-pisosr-utilize-the-for_each_set_clump8-macro.patch
gpio-max3191x-utilize-the-for_each_set_clump8-macro.patch
gpio-pca953x-utilize-the-for_each_set_clump8-macro.patch
