openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Andy Shevchenko 2021-03-30 22:33:23 +03:00 committed by Greg Kroah-Hartman
parent 5a1bea2a25
commit 5c777233c9
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/mux/gpio.c
View File

@ -7,6 +7,7 @@
* Author: Peter Rosin <peda@axentia.se> * Author: Peter Rosin <peda@axentia.se>
*/ */
#include <linux/bitmap.h>
#include <linux/err.h> #include <linux/err.h>
#include <linux/gpio/consumer.h> #include <linux/gpio/consumer.h>
#include <linux/module.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); struct mux_gpio *mux_gpio = mux_chip_priv(mux->chip);
DECLARE_BITMAP(values, BITS_PER_TYPE(state)); 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, gpiod_set_array_value_cansleep(mux_gpio->gpios->ndescs,
mux_gpio->gpios->desc, mux_gpio->gpios->desc,
@ -71,7 +73,7 @@ static int mux_gpio_probe(struct platform_device *pdev)
return ret; return ret;
} }
WARN_ON(pins != mux_gpio->gpios->ndescs); 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); ret = device_property_read_u32(dev, "idle-state", (u32 *)&idle_state);
if (ret >= 0 && idle_state != MUX_IDLE_AS_IS) { if (ret >= 0 && idle_state != MUX_IDLE_AS_IS) {