On Wed, Oct 09, 2019 at 01:14:50PM -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@xxxxxxxxxxxxxxx>
> Cc: Phil Reid <preid@xxxxxxxxxxxxxxxxx>
> Signed-off-by: William Breathitt Gray <vilhelm.gray@xxxxxxxxx>
> ---
> drivers/gpio/gpio-pca953x.c | 17 +++++++----------
> 1 file changed, 7 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/gpio/gpio-pca953x.c b/drivers/gpio/gpio-pca953x.c
> index de5d1383f28d..10b669b8f27d 100644
> --- a/drivers/gpio/gpio-pca953x.c
> +++ b/drivers/gpio/gpio-pca953x.c
> @@ -10,6 +10,7 @@
>
> #include <linux/acpi.h>
> #include <linux/bits.h>
> +#include <linux/bitops.h>
> #include <linux/gpio/driver.h>
> #include <linux/gpio/consumer.h>
> #include <linux/i2c.h>
> @@ -456,7 +457,8 @@ static void pca953x_gpio_set_multiple(struct gpio_chip *gc,
> unsigned long *mask, unsigned long *bits)
> {
> struct pca953x_chip *chip = gpiochip_get_data(gc);
> - unsigned int bank_mask, bank_val;
> + unsigned long offset;
> + unsigned long bank_mask;
> int bank;
> u8 reg_val[MAX_BANK];
> int ret;
> @@ -466,15 +468,10 @@ static void pca953x_gpio_set_multiple(struct gpio_chip *gc,
> if (ret)
> goto exit;
>
> - for (bank = 0; bank < NBANK(chip); bank++) {
> - bank_mask = mask[bank / sizeof(*mask)] >>
> - ((bank % sizeof(*mask)) * 8);
> - if (bank_mask) {
> - bank_val = bits[bank / sizeof(*bits)] >>
> - ((bank % sizeof(*bits)) * 8);
> - bank_val &= bank_mask;
> - reg_val[bank] = (reg_val[bank] & ~bank_mask) | bank_val;
> - }
> + for_each_set_clump8(offset, bank_mask, mask, gc->ngpio) {
> + bank = offset / 8;
> + reg_val[bank] &= ~bank_mask;
> + reg_val[bank] |= bitmap_get_value8(bits, offset) & bank_mask;
> }
>
> pca953x_write_regs(chip, chip->regs->output, reg_val);
> --
> 2.23.0
>
--
With Best Regards,
Andy Shevchenko
