From: Stephen Rothwell <sfr@canb•auug.org.au>
To: "Uwe Kleine-König" <ukleinek@kernel•org>
Cc: "Bartosz Golaszewski" <bartosz.golaszewski@linaro•org>,
"Uwe Kleine-König" <u.kleine-koenig@baylibre•com>,
"Linux Kernel Mailing List" <linux-kernel@vger•kernel.org>,
"Linux Next Mailing List" <linux-next@vger•kernel.org>
Subject: linux-next: manual merge the pwm tree with Linus' tree
Date: Tue, 12 Aug 2025 13:01:11 +1000 [thread overview]
Message-ID: <20250812130029.2a06ca7c@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1985 bytes --]
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@canb•auug.org.au>
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@canb•auug.org.au>
---
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 #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
reply other threads:[~2025-08-12 3:01 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250812130029.2a06ca7c@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=bartosz.golaszewski@linaro$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=u.kleine-koenig@baylibre$(echo .)com \
--cc=ukleinek@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox