Skip to content

Commit 059f547

Browse files
Bartosz GolaszewskiLinus Walleij
authored andcommitted
pinctrl: owl: use new GPIO line value setter callbacks
struct gpio_chip now has callbacks for setting line values that return an integer, allowing to indicate failures. Convert the driver to using them. Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> Acked-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> Link: https://lore.kernel.org/20250424-gpiochip-set-rv-pinctrl-part2-v1-4-504f91120b99@linaro.org Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
1 parent 8657c6e commit 059f547

1 file changed

Lines changed: 5 additions & 3 deletions

File tree

drivers/pinctrl/actions/pinctrl-owl.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -598,7 +598,7 @@ static int owl_gpio_get(struct gpio_chip *chip, unsigned int offset)
598598
return !!(val & BIT(offset));
599599
}
600600

601-
static void owl_gpio_set(struct gpio_chip *chip, unsigned int offset, int value)
601+
static int owl_gpio_set(struct gpio_chip *chip, unsigned int offset, int value)
602602
{
603603
struct owl_pinctrl *pctrl = gpiochip_get_data(chip);
604604
const struct owl_gpio_port *port;
@@ -607,13 +607,15 @@ static void owl_gpio_set(struct gpio_chip *chip, unsigned int offset, int value)
607607

608608
port = owl_gpio_get_port(pctrl, &offset);
609609
if (WARN_ON(port == NULL))
610-
return;
610+
return -ENODEV;
611611

612612
gpio_base = pctrl->base + port->offset;
613613

614614
raw_spin_lock_irqsave(&pctrl->lock, flags);
615615
owl_gpio_update_reg(gpio_base + port->dat, offset, value);
616616
raw_spin_unlock_irqrestore(&pctrl->lock, flags);
617+
618+
return 0;
617619
}
618620

619621
static int owl_gpio_direction_input(struct gpio_chip *chip, unsigned int offset)
@@ -960,7 +962,7 @@ int owl_pinctrl_probe(struct platform_device *pdev,
960962
pctrl->chip.direction_input = owl_gpio_direction_input;
961963
pctrl->chip.direction_output = owl_gpio_direction_output;
962964
pctrl->chip.get = owl_gpio_get;
963-
pctrl->chip.set = owl_gpio_set;
965+
pctrl->chip.set_rv = owl_gpio_set;
964966
pctrl->chip.request = owl_gpio_request;
965967
pctrl->chip.free = owl_gpio_free;
966968

0 commit comments

Comments
 (0)