From: William Breathitt Gray <vilhelm.gray@gmail.com> To: linus.walleij@linaro.org, bgolaszewski@baylibre.com Cc: akpm@linux-foundation.org, linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, andriy.shevchenko@linux.intel.com, linux@rasmusvillemoes.dk, yamada.masahiro@socionext.com, linux-arm-kernel@lists.infradead.org, linux-pm@vger.kernel.org, geert@linux-m68k.org, preid@electromag.com.au, lukas@wunner.de, sean.nyekjaer@prevas.dk, morten.tiljeset@prevas.dk, William Breathitt Gray <vilhelm.gray@gmail.com>, Mathias Duckeck <m.duckeck@kunbus.de> Subject: [PATCH v15 13/14] gpio: max3191x: Utilize the for_each_set_clump8 macro Date: Sat, 5 Oct 2019 14:37:07 -0400 [thread overview] Message-ID: <f07b6bb5619ea1365cc58266254a7b5be65a9082.1570299719.git.vilhelm.gray@gmail.com> (raw) In-Reply-To: <cover.1570299719.git.vilhelm.gray@gmail.com> Replace verbose implementation in get_multiple callback with for_each_set_clump8 macro to simplify code and improve clarity. Cc: Mathias Duckeck <m.duckeck@kunbus.de> Cc: Lukas Wunner <lukas@wunner.de> Signed-off-by: William Breathitt Gray <vilhelm.gray@gmail.com> --- drivers/gpio/gpio-max3191x.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/drivers/gpio/gpio-max3191x.c b/drivers/gpio/gpio-max3191x.c index 4b4b2ceb82fc..9a98ecf625ac 100644 --- a/drivers/gpio/gpio-max3191x.c +++ b/drivers/gpio/gpio-max3191x.c @@ -31,6 +31,7 @@ */ #include <linux/bitmap.h> +#include <linux/bitops.h> #include <linux/crc8.h> #include <linux/gpio/consumer.h> #include <linux/gpio/driver.h> @@ -232,16 +233,20 @@ static int max3191x_get_multiple(struct gpio_chip *gpio, unsigned long *mask, unsigned long *bits) { struct max3191x_chip *max3191x = gpiochip_get_data(gpio); - int ret, bit = 0, wordlen = max3191x_wordlen(max3191x); + const unsigned int wordlen = max3191x_wordlen(max3191x); + int ret; + unsigned long bit; + unsigned long gpio_mask; + unsigned long in; mutex_lock(&max3191x->lock); ret = max3191x_readout_locked(max3191x); if (ret) goto out_unlock; - while ((bit = find_next_bit(mask, gpio->ngpio, bit)) != gpio->ngpio) { + bitmap_zero(bits, gpio->ngpio); + for_each_set_clump8(bit, gpio_mask, mask, gpio->ngpio) { unsigned int chipnum = bit / MAX3191X_NGPIO; - unsigned long in, shift, index; if (max3191x_chip_is_faulting(max3191x, chipnum)) { ret = -EIO; @@ -249,12 +254,8 @@ static int max3191x_get_multiple(struct gpio_chip *gpio, unsigned long *mask, } in = ((u8 *)max3191x->xfer.rx_buf)[chipnum * wordlen]; - shift = round_down(bit % BITS_PER_LONG, MAX3191X_NGPIO); - index = bit / BITS_PER_LONG; - bits[index] &= ~(mask[index] & (0xff << shift)); - bits[index] |= mask[index] & (in << shift); /* copy bits */ - - bit = (chipnum + 1) * MAX3191X_NGPIO; /* go to next chip */ + in &= gpio_mask; + bitmap_set_value8(bits, in, offset); } out_unlock: -- 2.23.0
WARNING: multiple messages have this Message-ID (diff)
From: William Breathitt Gray <vilhelm.gray@gmail.com> To: linus.walleij@linaro.org, bgolaszewski@baylibre.com Cc: linux-arch@vger.kernel.org, Mathias Duckeck <m.duckeck@kunbus.de>, preid@electromag.com.au, William Breathitt Gray <vilhelm.gray@gmail.com>, yamada.masahiro@socionext.com, linux-pm@vger.kernel.org, linux@rasmusvillemoes.dk, linux-kernel@vger.kernel.org, morten.tiljeset@prevas.dk, sean.nyekjaer@prevas.dk, linux-gpio@vger.kernel.org, lukas@wunner.de, geert@linux-m68k.org, akpm@linux-foundation.org, andriy.shevchenko@linux.intel.com, linux-arm-kernel@lists.infradead.org Subject: [PATCH v15 13/14] gpio: max3191x: Utilize the for_each_set_clump8 macro Date: Sat, 5 Oct 2019 14:37:07 -0400 [thread overview] Message-ID: <f07b6bb5619ea1365cc58266254a7b5be65a9082.1570299719.git.vilhelm.gray@gmail.com> (raw) In-Reply-To: <cover.1570299719.git.vilhelm.gray@gmail.com> Replace verbose implementation in get_multiple callback with for_each_set_clump8 macro to simplify code and improve clarity. Cc: Mathias Duckeck <m.duckeck@kunbus.de> Cc: Lukas Wunner <lukas@wunner.de> Signed-off-by: William Breathitt Gray <vilhelm.gray@gmail.com> --- drivers/gpio/gpio-max3191x.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/drivers/gpio/gpio-max3191x.c b/drivers/gpio/gpio-max3191x.c index 4b4b2ceb82fc..9a98ecf625ac 100644 --- a/drivers/gpio/gpio-max3191x.c +++ b/drivers/gpio/gpio-max3191x.c @@ -31,6 +31,7 @@ */ #include <linux/bitmap.h> +#include <linux/bitops.h> #include <linux/crc8.h> #include <linux/gpio/consumer.h> #include <linux/gpio/driver.h> @@ -232,16 +233,20 @@ static int max3191x_get_multiple(struct gpio_chip *gpio, unsigned long *mask, unsigned long *bits) { struct max3191x_chip *max3191x = gpiochip_get_data(gpio); - int ret, bit = 0, wordlen = max3191x_wordlen(max3191x); + const unsigned int wordlen = max3191x_wordlen(max3191x); + int ret; + unsigned long bit; + unsigned long gpio_mask; + unsigned long in; mutex_lock(&max3191x->lock); ret = max3191x_readout_locked(max3191x); if (ret) goto out_unlock; - while ((bit = find_next_bit(mask, gpio->ngpio, bit)) != gpio->ngpio) { + bitmap_zero(bits, gpio->ngpio); + for_each_set_clump8(bit, gpio_mask, mask, gpio->ngpio) { unsigned int chipnum = bit / MAX3191X_NGPIO; - unsigned long in, shift, index; if (max3191x_chip_is_faulting(max3191x, chipnum)) { ret = -EIO; @@ -249,12 +254,8 @@ static int max3191x_get_multiple(struct gpio_chip *gpio, unsigned long *mask, } in = ((u8 *)max3191x->xfer.rx_buf)[chipnum * wordlen]; - shift = round_down(bit % BITS_PER_LONG, MAX3191X_NGPIO); - index = bit / BITS_PER_LONG; - bits[index] &= ~(mask[index] & (0xff << shift)); - bits[index] |= mask[index] & (in << shift); /* copy bits */ - - bit = (chipnum + 1) * MAX3191X_NGPIO; /* go to next chip */ + in &= gpio_mask; + bitmap_set_value8(bits, in, offset); } out_unlock: -- 2.23.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-10-05 18:38 UTC|newest] Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-10-05 18:36 [PATCH v15 00/14] Introduce the for_each_set_clump8 macro William Breathitt Gray 2019-10-05 18:36 ` William Breathitt Gray 2019-10-05 18:36 ` [PATCH v15 01/14] bitops: " William Breathitt Gray 2019-10-05 18:36 ` William Breathitt Gray 2019-10-09 9:25 ` Linus Walleij 2019-10-09 9:25 ` Linus Walleij 2019-10-05 18:36 ` [PATCH v15 02/14] lib/test_bitmap.c: Add for_each_set_clump8 test cases William Breathitt Gray 2019-10-05 18:36 ` William Breathitt Gray 2019-10-05 18:36 ` [PATCH v15 03/14] gpio: 104-dio-48e: Utilize for_each_set_clump8 macro William Breathitt Gray 2019-10-05 18:36 ` William Breathitt Gray 2019-10-05 18:36 ` [PATCH v15 04/14] gpio: 104-idi-48: " William Breathitt Gray 2019-10-05 18:36 ` William Breathitt Gray 2019-10-05 18:36 ` [PATCH v15 05/14] gpio: gpio-mm: " William Breathitt Gray 2019-10-05 18:36 ` William Breathitt Gray 2019-10-05 18:37 ` [PATCH v15 06/14] gpio: ws16c48: " William Breathitt Gray 2019-10-05 18:37 ` William Breathitt Gray 2019-10-05 18:37 ` [PATCH v15 07/14] gpio: pci-idio-16: " William Breathitt Gray 2019-10-05 18:37 ` William Breathitt Gray 2019-10-05 18:37 ` [PATCH v15 08/14] gpio: pcie-idio-24: " William Breathitt Gray 2019-10-05 18:37 ` William Breathitt Gray 2019-10-05 18:37 ` [PATCH v15 09/14] gpio: uniphier: " William Breathitt Gray 2019-10-05 18:37 ` William Breathitt Gray 2019-10-05 18:37 ` [PATCH v15 10/14] gpio: 74x164: Utilize the " William Breathitt Gray 2019-10-05 18:37 ` William Breathitt Gray 2019-10-05 18:37 ` [PATCH v15 11/14] thermal: intel: intel_soc_dts_iosf: Utilize " William Breathitt Gray 2019-10-05 18:37 ` William Breathitt Gray 2019-10-05 18:37 ` [PATCH v15 12/14] gpio: pisosr: Utilize the " William Breathitt Gray 2019-10-05 18:37 ` William Breathitt Gray 2019-10-05 18:37 ` William Breathitt Gray [this message] 2019-10-05 18:37 ` [PATCH v15 13/14] gpio: max3191x: " William Breathitt Gray 2019-10-05 23:26 ` kbuild test robot 2019-10-05 23:26 ` kbuild test robot 2019-10-05 23:26 ` kbuild test robot 2019-10-05 23:26 ` kbuild test robot 2019-10-05 23:26 ` kbuild test robot 2019-10-06 19:26 ` kbuild test robot 2019-10-06 19:26 ` kbuild test robot 2019-10-06 19:26 ` kbuild test robot 2019-10-06 19:26 ` kbuild test robot 2019-10-06 19:26 ` kbuild test robot 2019-10-05 18:37 ` [PATCH v15 14/14] gpio: pca953x: " William Breathitt Gray 2019-10-05 18:37 ` William Breathitt Gray 2019-10-05 18:46 ` [PATCH v15 00/14] Introduce " William Breathitt Gray 2019-10-05 18:46 ` 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=f07b6bb5619ea1365cc58266254a7b5be65a9082.1570299719.git.vilhelm.gray@gmail.com \ --to=vilhelm.gray@gmail.com \ --cc=akpm@linux-foundation.org \ --cc=andriy.shevchenko@linux.intel.com \ --cc=bgolaszewski@baylibre.com \ --cc=geert@linux-m68k.org \ --cc=linus.walleij@linaro.org \ --cc=linux-arch@vger.kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-gpio@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-pm@vger.kernel.org \ --cc=linux@rasmusvillemoes.dk \ --cc=lukas@wunner.de \ --cc=m.duckeck@kunbus.de \ --cc=morten.tiljeset@prevas.dk \ --cc=preid@electromag.com.au \ --cc=sean.nyekjaer@prevas.dk \ --cc=yamada.masahiro@socionext.com \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.