| Message ID | 7ea2df7182a50a1136ca36edc46dffcb2446fd27.1570641097.git.vilhelm.gray@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | Introduce the for_each_set_clump8 macro | expand |
On Wed, Oct 09, 2019 at 01:14:46PM -0400, William Breathitt Gray wrote: > Replace verbose implementation in set_multiple callback with > for_each_set_clump8 macro to simplify code and improve clarity. > Tested-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > Suggested-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > Cc: Geert Uytterhoeven <geert+renesas@glider.be> > Cc: Phil Reid <preid@electromag.com.au> > Signed-off-by: William Breathitt Gray <vilhelm.gray@gmail.com> > --- > drivers/gpio/gpio-74x164.c | 19 +++++++++---------- > 1 file changed, 9 insertions(+), 10 deletions(-) > > diff --git a/drivers/gpio/gpio-74x164.c b/drivers/gpio/gpio-74x164.c > index e81307f9754e..05637d585152 100644 > --- a/drivers/gpio/gpio-74x164.c > +++ b/drivers/gpio/gpio-74x164.c > @@ -6,6 +6,7 @@ > * Copyright (C) 2010 Miguel Gaio <miguel.gaio@efixo.com> > */ > > +#include <linux/bitops.h> > #include <linux/gpio/consumer.h> > #include <linux/gpio/driver.h> > #include <linux/module.h> > @@ -72,20 +73,18 @@ static void gen_74x164_set_multiple(struct gpio_chip *gc, unsigned long *mask, > unsigned long *bits) > { > struct gen_74x164_chip *chip = gpiochip_get_data(gc); > - unsigned int i, idx, shift; > - u8 bank, bankmask; > + unsigned long offset; > + unsigned long bankmask; > + size_t bank; > + unsigned long bitmask; > > mutex_lock(&chip->lock); > - for (i = 0, bank = chip->registers - 1; i < chip->registers; > - i++, bank--) { > - idx = i / sizeof(*mask); > - shift = i % sizeof(*mask) * BITS_PER_BYTE; > - bankmask = mask[idx] >> shift; > - if (!bankmask) > - continue; > + for_each_set_clump8(offset, bankmask, mask, chip->registers * 8) { > + bank = chip->registers - 1 - offset / 8; > + bitmask = bitmap_get_value8(bits, offset) & bankmask; > > chip->buffer[bank] &= ~bankmask; > - chip->buffer[bank] |= bankmask & (bits[idx] >> shift); > + chip->buffer[bank] |= bitmask; > } > __gen_74x164_write_config(chip); > mutex_unlock(&chip->lock); > -- > 2.23.0 >
diff --git a/drivers/gpio/gpio-74x164.c b/drivers/gpio/gpio-74x164.c index e81307f9754e..05637d585152 100644 --- a/drivers/gpio/gpio-74x164.c +++ b/drivers/gpio/gpio-74x164.c @@ -6,6 +6,7 @@ * Copyright (C) 2010 Miguel Gaio <miguel.gaio@efixo.com> */ +#include <linux/bitops.h> #include <linux/gpio/consumer.h> #include <linux/gpio/driver.h> #include <linux/module.h> @@ -72,20 +73,18 @@ static void gen_74x164_set_multiple(struct gpio_chip *gc, unsigned long *mask, unsigned long *bits) { struct gen_74x164_chip *chip = gpiochip_get_data(gc); - unsigned int i, idx, shift; - u8 bank, bankmask; + unsigned long offset; + unsigned long bankmask; + size_t bank; + unsigned long bitmask; mutex_lock(&chip->lock); - for (i = 0, bank = chip->registers - 1; i < chip->registers; - i++, bank--) { - idx = i / sizeof(*mask); - shift = i % sizeof(*mask) * BITS_PER_BYTE; - bankmask = mask[idx] >> shift; - if (!bankmask) - continue; + for_each_set_clump8(offset, bankmask, mask, chip->registers * 8) { + bank = chip->registers - 1 - offset / 8; + bitmask = bitmap_get_value8(bits, offset) & bankmask; chip->buffer[bank] &= ~bankmask; - chip->buffer[bank] |= bankmask & (bits[idx] >> shift); + chip->buffer[bank] |= bitmask; } __gen_74x164_write_config(chip); mutex_unlock(&chip->lock);
Replace verbose implementation in set_multiple callback with for_each_set_clump8 macro to simplify code and improve clarity. Suggested-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Cc: Geert Uytterhoeven <geert+renesas@glider.be> Cc: Phil Reid <preid@electromag.com.au> Signed-off-by: William Breathitt Gray <vilhelm.gray@gmail.com> --- drivers/gpio/gpio-74x164.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-)