summaryrefslogtreecommitdiffstats
path: root/drivers/mux
diff options
context:
space:
mode:
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>2021-03-30 22:33:23 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-04-02 16:28:53 +0200
commit5c777233c90f80a75cbd79c1b2fd713453dd02ff (patch)
tree70ac830c76d3af672c87ed3380091c295a2b9299 /drivers/mux
parent5a1bea2a2572ce5eb4bdcf432a6929681ee381f2 (diff)
downloadlinux-5c777233c90f80a75cbd79c1b2fd713453dd02ff.tar.gz
linux-5c777233c90f80a75cbd79c1b2fd713453dd02ff.tar.bz2
linux-5c777233c90f80a75cbd79c1b2fd713453dd02ff.zip
mux: gpio: Use bitmap API instead of direct assignment
Assigning bitmaps like it's done in the driver might be error prone. Fix this by using bitmap API. Acked-by: Peter Rosin <peda@axentia.se> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Link: https://lore.kernel.org/r/20210330193325.68362-1-andriy.shevchenko@linux.intel.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/mux')
-rw-r--r--drivers/mux/gpio.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/mux/gpio.c b/drivers/mux/gpio.c
index 02c1f2c014e8..d1b4aa923657 100644
--- a/drivers/mux/gpio.c
+++ b/drivers/mux/gpio.c
@@ -7,6 +7,7 @@
* Author: Peter Rosin <peda@axentia.se>
*/
+#include <linux/bitmap.h>
#include <linux/err.h>
#include <linux/gpio/consumer.h>
#include <linux/module.h>
@@ -23,8 +24,9 @@ static int mux_gpio_set(struct mux_control *mux, int state)
{
struct mux_gpio *mux_gpio = mux_chip_priv(mux->chip);
DECLARE_BITMAP(values, BITS_PER_TYPE(state));
+ u32 value = state;
- values[0] = state;
+ bitmap_from_arr32(values, &value, BITS_PER_TYPE(value));
gpiod_set_array_value_cansleep(mux_gpio->gpios->ndescs,
mux_gpio->gpios->desc,
@@ -71,7 +73,7 @@ static int mux_gpio_probe(struct platform_device *pdev)
return ret;
}
WARN_ON(pins != mux_gpio->gpios->ndescs);
- mux_chip->mux->states = 1 << pins;
+ mux_chip->mux->states = BIT(pins);
ret = device_property_read_u32(dev, "idle-state", (u32 *)&idle_state);
if (ret >= 0 && idle_state != MUX_IDLE_AS_IS) {