linux-next: manual merge the pwm tree with Linus' tree
From: Stephen Rothwell
Date: Mon Aug 11 2025 - 23:03:26 EST
Hi all,
After merging the pwm tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:
drivers/pwm/core.c: In function '__pwmchip_add':
drivers/pwm/core.c:2514:26: error: 'struct gpio_chip' has no member named 'set_rv'
2514 | .set_rv = pwm_gpio_set,
| ^~~~~~
drivers/pwm/core.c:2514:35: error: initialization of 'int (*)(struct gpio_chip *, unsigned int)' from incompatible pointer type 'int (*)(struct gpio_chip *, unsigned int, int)' [-Wincompatible-pointer-types]
2514 | .set_rv = pwm_gpio_set,
| ^~~~~~~~~~~~
drivers/pwm/core.c:2514:35: note: (near initialization for '(anonymous).direction_input')
Caused by commit
1c84bb7fc0ad ("pwm: Provide a gpio device for waveform drivers")
interacting with commit
d9d87d90cc0b ("treewide: rename GPIO set callbacks back to their original names")
from Linus' tree.
I have applied this merge fix patch for today:
From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Tue, 12 Aug 2025 12:38:34 +1000
Subject: [PATCH] fix up for "pwm: Provide a gpio device for waveform drivers"
interacting with commit
d9d87d90cc0b ("treewide: rename GPIO set callbacks back to their original names")
from Linus' tree.
Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
drivers/pwm/core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/pwm/core.c b/drivers/pwm/core.c
index b05186b9569e..ec4112e6209a 100644
--- a/drivers/pwm/core.c
+++ b/drivers/pwm/core.c
@@ -2511,7 +2511,7 @@ int __pwmchip_add(struct pwm_chip *chip, struct module *owner)
.request = pwm_gpio_request,
.free = pwm_gpio_free,
.get_direction = pwm_gpio_get_direction,
- .set_rv = pwm_gpio_set,
+ .set = pwm_gpio_set,
.base = -1,
.ngpio = chip->npwm,
.can_sleep = true,
--
2.50.1
--
Cheers,
Stephen Rothwell
Attachment:
pgppfYlZO8ucv.pgp
Description: OpenPGP digital signature