From: Thierry Reding <thierry.reding@gmail•com>
To: Lee Jones <lee@kernel•org>
Cc: Sean Young <sean@mess•org>,
Stephen Rothwell <sfr@canb•auug.org.au>,
Flavio Suligoi <f.suligoi@asem•it>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: Re: linux-next: build failure after merge of the pwm tree
Date: Thu, 21 Dec 2023 10:25:06 +0100 [thread overview]
Message-ID: <ZYQEcg0-SEFEeuN6@orome.fritz.box> (raw)
In-Reply-To: <20231221165805.0c4771c1@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 2733 bytes --]
On Thu, Dec 21, 2023 at 04:58:05PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> After merging the backlight tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/video/backlight/mp3309c.c: In function 'mp3309c_bl_update_status':
> drivers/video/backlight/mp3309c.c:134:23: error: implicit declaration of function 'pwm_apply_state'; did you mean 'pwm_apply_args'? [-Werror=implicit-function-declaration]
> 134 | ret = pwm_apply_state(chip->pwmd, &pwmstate);
> | ^~~~~~~~~~~~~~~
> | pwm_apply_args
>
> Caused by commit
>
> c748a6d77c06 ("pwm: Rename pwm_apply_state() to pwm_apply_might_sleep()")
>
> interacting with commit
>
> 2e914516a58c ("backlight: mp3309c: Add support for MPS MP3309C")
>
> from the backlight tree.
>
> I have appplied the following merge fix patch.
>
> From: Stephen Rothwell <sfr@canb•auug.org.au>
> Date: Thu, 21 Dec 2023 16:13:37 +1100
> Subject: [PATCH] fix up for "backlight: mp3309c: Add support for MPS MP3309C"
>
> from the backlight tree interacting with commit
>
> c748a6d77c06 ("pwm: Rename pwm_apply_state() to pwm_apply_might_sleep()")
>
> from the pwm tree.
>
> Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
> ---
> drivers/video/backlight/mp3309c.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/video/backlight/mp3309c.c b/drivers/video/backlight/mp3309c.c
> index 34d71259fac1..b0d9aef6942b 100644
> --- a/drivers/video/backlight/mp3309c.c
> +++ b/drivers/video/backlight/mp3309c.c
> @@ -131,7 +131,7 @@ static int mp3309c_bl_update_status(struct backlight_device *bl)
> chip->pdata->levels[brightness],
> chip->pdata->levels[chip->pdata->max_brightness]);
> pwmstate.enabled = true;
> - ret = pwm_apply_state(chip->pwmd, &pwmstate);
> + ret = pwm_apply_might_sleep(chip->pwmd, &pwmstate);
> if (ret)
> return ret;
>
> @@ -393,7 +393,7 @@ static int mp3309c_probe(struct i2c_client *client)
> chip->pdata->default_brightness,
> chip->pdata->max_brightness);
> pwmstate.enabled = true;
> - ret = pwm_apply_state(chip->pwmd, &pwmstate);
> + ret = pwm_apply_might_sleep(chip->pwmd, &pwmstate);
> if (ret)
> return dev_err_probe(chip->dev, ret,
> "error setting pwm device\n");
Hi Lee,
We could exchange stable tags to make this work, but given that people
(myself included) are getting into holiday mode I'm inclined to just add
a pwm_apply_state() compatibility inline for now and then we can address
this in the new year or for the next cycle. What do you think?
Thierry
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
next prev parent reply other threads:[~2023-12-21 9:25 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-21 5:58 linux-next: build failure after merge of the pwm tree Stephen Rothwell
2023-12-21 9:25 ` Thierry Reding [this message]
2023-12-21 10:09 ` Lee Jones
2023-12-21 12:13 ` Sean Young
2023-12-21 12:51 ` Lee Jones
2023-12-21 12:54 ` (subset) " Lee Jones
2023-12-21 12:58 ` Lee Jones
2023-12-21 18:34 ` Thierry Reding
2023-12-22 1:27 ` Stephen Rothwell
2024-01-02 0:47 ` Stephen Rothwell
2024-01-04 0:55 ` Stephen Rothwell
2024-01-04 10:02 ` Bagas Sanjaya
2024-01-04 12:50 ` Sean Young
2024-01-04 22:04 ` Stephen Rothwell
2024-01-08 17:15 ` Lee Jones
2024-01-05 2:20 ` Bagas Sanjaya
[not found] <CGME20251027015241eucas1p1784b974d0c150e8c3513f32401205669@eucas1p1.samsung.com>
2025-10-27 1:51 ` Stephen Rothwell
2025-10-27 8:11 ` Uwe Kleine-König
2025-10-27 9:38 ` Danilo Krummrich
2025-10-28 1:51 ` Stephen Rothwell
2025-12-05 3:33 ` Stephen Rothwell
2025-10-27 13:40 ` Uwe Kleine-König
2025-10-27 13:49 ` Danilo Krummrich
2025-10-27 8:36 ` Michal Wilczynski
-- strict thread matches above, loose matches on Subject: below --
2019-01-12 6:01 Stephen Rothwell
2019-01-12 6:08 ` Stephen Rothwell
2019-01-12 15:27 ` Uwe Kleine-König
2014-08-22 21:07 Stephen Rothwell
2014-08-22 22:06 ` Thierry Reding
2014-08-22 22:15 ` Thierry Reding
2014-08-22 22:30 ` Stephen Rothwell
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=ZYQEcg0-SEFEeuN6@orome.fritz.box \
--to=thierry.reding@gmail$(echo .)com \
--cc=f.suligoi@asem$(echo .)it \
--cc=lee@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sean@mess$(echo .)org \
--cc=sfr@canb$(echo .)auug.org.au \
/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