diff options
| author | Linus Torvalds <[email protected]> | 2025-06-02 19:16:17 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2025-06-02 19:16:17 +0000 |
| commit | df7b9b4f6bfeb1143e7626c536e03bb122e90cc9 (patch) | |
| tree | 56122f8da6a528b476aa0e22ac893e875578b0b7 /arch/m68k/coldfire/gpio.c | |
| parent | Merge tag 'input-for-v6.16-rc0' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
| parent | m68k: Replace memcpy() + manual NUL-termination with strscpy() (diff) | |
| download | kernel-df7b9b4f6bfeb1143e7626c536e03bb122e90cc9.tar.gz kernel-df7b9b4f6bfeb1143e7626c536e03bb122e90cc9.zip | |
Merge tag 'm68knommu-for-v6.16' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
Pull m68knommu updates from Greg Ungerer:
- use new gpio line value settings
- use strscpy() more
* tag 'm68knommu-for-v6.16' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
m68k: Replace memcpy() + manual NUL-termination with strscpy()
m68k/kernel: replace strncpy() with strscpy()
m68k: coldfire: gpio: use new line value setter callbacks
Diffstat (limited to 'arch/m68k/coldfire/gpio.c')
| -rw-r--r-- | arch/m68k/coldfire/gpio.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/m68k/coldfire/gpio.c b/arch/m68k/coldfire/gpio.c index ca26de257871..30e5a4ed799d 100644 --- a/arch/m68k/coldfire/gpio.c +++ b/arch/m68k/coldfire/gpio.c @@ -123,10 +123,12 @@ static int mcfgpio_direction_output(struct gpio_chip *chip, unsigned offset, return __mcfgpio_direction_output(offset, value); } -static void mcfgpio_set_value(struct gpio_chip *chip, unsigned offset, - int value) +static int mcfgpio_set_value(struct gpio_chip *chip, unsigned int offset, + int value) { __mcfgpio_set_value(offset, value); + + return 0; } static int mcfgpio_request(struct gpio_chip *chip, unsigned offset) @@ -158,7 +160,7 @@ static struct gpio_chip mcfgpio_chip = { .direction_input = mcfgpio_direction_input, .direction_output = mcfgpio_direction_output, .get = mcfgpio_get_value, - .set = mcfgpio_set_value, + .set_rv = mcfgpio_set_value, .to_irq = mcfgpio_to_irq, .base = 0, .ngpio = MCFGPIO_PIN_MAX, |