Skip to content

Commit dd8a6af

Browse files
author
Bartosz Golaszewski
committed
ARM: scoop/gpio: use new 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. Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Bartosz Golaszewski <[email protected]>
1 parent 9c37821 commit dd8a6af

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

arch/arm/common/scoop.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,8 @@ static void __scoop_gpio_set(struct scoop_dev *sdev,
6363
iowrite16(gpwr, sdev->base + SCOOP_GPWR);
6464
}
6565

66-
static void scoop_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
66+
static int scoop_gpio_set(struct gpio_chip *chip, unsigned int offset,
67+
int value)
6768
{
6869
struct scoop_dev *sdev = gpiochip_get_data(chip);
6970
unsigned long flags;
@@ -73,6 +74,8 @@ static void scoop_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
7374
__scoop_gpio_set(sdev, offset, value);
7475

7576
spin_unlock_irqrestore(&sdev->scoop_lock, flags);
77+
78+
return 0;
7679
}
7780

7881
static int scoop_gpio_get(struct gpio_chip *chip, unsigned offset)
@@ -215,7 +218,7 @@ static int scoop_probe(struct platform_device *pdev)
215218
devptr->gpio.label = dev_name(&pdev->dev);
216219
devptr->gpio.base = inf->gpio_base;
217220
devptr->gpio.ngpio = 12; /* PA11 = 0, PA12 = 1, etc. up to PA22 = 11 */
218-
devptr->gpio.set = scoop_gpio_set;
221+
devptr->gpio.set_rv = scoop_gpio_set;
219222
devptr->gpio.get = scoop_gpio_get;
220223
devptr->gpio.direction_input = scoop_gpio_direction_input;
221224
devptr->gpio.direction_output = scoop_gpio_direction_output;

0 commit comments

Comments
 (0)