Skip to content

Commit 12702f0

Browse files
Bartosz Golaszewskiarndb
authored andcommitted
soc: fsl: qe: convert set_multiple() to returning an integer
The conversion to using the new GPIO line setter callbacks missed the set_multiple() in this file. Convert it to using the new callback. Fixes: 52ccf19 ("soc: fsl: qe: use new GPIO line value setter callbacks") Signed-off-by: Bartosz Golaszewski <[email protected]>
1 parent 83d92ea commit 12702f0

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

drivers/soc/fsl/qe/gpio.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ static int qe_gpio_set(struct gpio_chip *gc, unsigned int gpio, int val)
7979
return 0;
8080
}
8181

82-
static void qe_gpio_set_multiple(struct gpio_chip *gc,
83-
unsigned long *mask, unsigned long *bits)
82+
static int qe_gpio_set_multiple(struct gpio_chip *gc,
83+
unsigned long *mask, unsigned long *bits)
8484
{
8585
struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc);
8686
struct qe_gpio_chip *qe_gc = gpiochip_get_data(gc);
@@ -104,6 +104,8 @@ static void qe_gpio_set_multiple(struct gpio_chip *gc,
104104
iowrite32be(qe_gc->cpdata, &regs->cpdata);
105105

106106
spin_unlock_irqrestore(&qe_gc->lock, flags);
107+
108+
return 0;
107109
}
108110

109111
static int qe_gpio_dir_in(struct gpio_chip *gc, unsigned int gpio)
@@ -320,7 +322,7 @@ static int __init qe_add_gpiochips(void)
320322
gc->direction_output = qe_gpio_dir_out;
321323
gc->get = qe_gpio_get;
322324
gc->set_rv = qe_gpio_set;
323-
gc->set_multiple = qe_gpio_set_multiple;
325+
gc->set_multiple_rv = qe_gpio_set_multiple;
324326

325327
ret = of_mm_gpiochip_add_data(np, mm_gc, qe_gc);
326328
if (ret)

0 commit comments

Comments
 (0)