[PATCH 3/4] gpio: xilinx: Modify bitmap_set_value() calls

From: Syed Nayyar Waris
Date: Fri Nov 20 2020 - 12:47:24 EST


Modify the bitmap_set_value() calls. bitmap_set_value()
now takes an extra bitmap width as second argument and the width of
value is now present as the fourth argument.

Cc: Michal Simek <michal.simek@xxxxxxxxxx>
Signed-off-by: Syed Nayyar Waris <syednwaris@xxxxxxxxx>
---
drivers/gpio/gpio-xilinx.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/gpio/gpio-xilinx.c b/drivers/gpio/gpio-xilinx.c
index ad4ee4145db4..05dae086c4d0 100644
--- a/drivers/gpio/gpio-xilinx.c
+++ b/drivers/gpio/gpio-xilinx.c
@@ -151,16 +151,16 @@ static void xgpio_set_multiple(struct gpio_chip *gc, unsigned long *mask,
spin_lock_irqsave(&chip->gpio_lock[0], flags);
spin_lock(&chip->gpio_lock[1]);

- bitmap_set_value(old, state[0], 0, width[0]);
- bitmap_set_value(old, state[1], width[0], width[1]);
+ bitmap_set_value(old, 64, state[0], width[0], 0);
+ bitmap_set_value(old, 64, state[1], width[1], width[0]);
bitmap_replace(new, old, bits, mask, gc->ngpio);

- bitmap_set_value(old, state[0], 0, 32);
- bitmap_set_value(old, state[1], 32, 32);
+ bitmap_set_value(old, 64, state[0], 32, 0);
+ bitmap_set_value(old, 64, state[1], 32, 32);
state[0] = bitmap_get_value(new, 0, width[0]);
state[1] = bitmap_get_value(new, width[0], width[1]);
- bitmap_set_value(new, state[0], 0, 32);
- bitmap_set_value(new, state[1], 32, 32);
+ bitmap_set_value(new, 64, state[0], 32, 0);
+ bitmap_set_value(new, 64, state[1], 32, 32);
bitmap_xor(changed, old, new, 64);

if (((u32 *)changed)[0])
--
2.29.0