Received-SPF: pass (google.com: domain of linux-kernel+bounces-8117-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
Date: Thu, 21 Dec 2023 10:25:06 +0100
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
Message-ID: <ZYQEcg0-SEFEeuN6@orome.fritz.box>
References: <20231221165805.0c4771c1@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
	protocol="application/pgp-signature"; boundary="0Q/Ht7HQv8P8dMbf"
Content-Disposition: inline
In-Reply-To: <20231221165805.0c4771c1@canb.auug.org.au>
User-Agent: Mutt/2.2.12 (2023-09-09)


--0Q/Ht7HQv8P8dMbf
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Thu, Dec 21, 2023 at 04:58:05PM +1100, Stephen Rothwell wrote:
> Hi all,
>=20
> After merging the backlight tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>=20
> 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=3Dimpli=
cit-function-declaration]
>   134 |                 ret =3D pwm_apply_state(chip->pwmd, &pwmstate);
>       |                       ^~~~~~~~~~~~~~~
>       |                       pwm_apply_args
>=20
> Caused by commit
>=20
>   c748a6d77c06 ("pwm: Rename pwm_apply_state() to pwm_apply_might_sleep()=
")
>=20
> interacting with commit
>=20
>   2e914516a58c ("backlight: mp3309c: Add support for MPS MP3309C")
>=20
> from the backlight tree.
>=20
> I have appplied the following merge fix patch.
>=20
> 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 MP33=
09C"
>=20
> from the backlight tree interacting with commit
>=20
>   c748a6d77c06 ("pwm: Rename pwm_apply_state() to pwm_apply_might_sleep()=
")
>=20
> from the pwm tree.
>=20
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/video/backlight/mp3309c.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>=20
> 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 =3D true;
> -		ret =3D pwm_apply_state(chip->pwmd, &pwmstate);
> +		ret =3D pwm_apply_might_sleep(chip->pwmd, &pwmstate);
>  		if (ret)
>  			return ret;
> =20
> @@ -393,7 +393,7 @@ static int mp3309c_probe(struct i2c_client *client)
>  					    chip->pdata->default_brightness,
>  					    chip->pdata->max_brightness);
>  		pwmstate.enabled =3D true;
> -		ret =3D pwm_apply_state(chip->pwmd, &pwmstate);
> +		ret =3D 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

--0Q/Ht7HQv8P8dMbf
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQIzBAABCAAdFiEEiOrDCAFJzPfAjcif3SOs138+s6EFAmWEBHIACgkQ3SOs138+
s6GBoQ/8CDWjDCw4kMybF0fuITOSwjywIj3s25B5D+0/fKrhrPYUlX8n/2k/x5Ue
SOSMI/8uYJGxYucxPme3p5Cd594BrtUT9sMDUqa+BUyl6PGgXdW6sElXmaXd+rRG
bI3F2zDZf/DymmnAYQixuuS5NnJaJGQIrhG74OINI5J3wq2p9nFyDH7aGroId9KS
9KCFHnBXqfn3Etw/rSyXPh4aB/F4KQEy2iz8sQi+medqJNiD5zXMLzgWTto8sYdM
qZAU9YichkvYf2U45MbIppBHeU0egvAty+YXgJHuuBEUTuZh4y+e2tNv9VtNcN1O
T8jyCUdTYBLOz+V/CmJCm8aRng4a07QN/+bBWJXnuG2iVf/Mu8RvtQBiOVysenoL
5b9EMXBzXXpL4IzjT+BB83oKl4ca4mEAO+O5EmUOHFPgMk7Wd8zbrBJmRj2OxzLI
My0+C+5voAkdM2IPer6TE41YQCnw8c50s5mZ6lJwhAi3W4h0shHOCDLoM28dEXFF
R0t4r/hMM4IGaUzmAV5kcWBTByTlP5VCU+Zu1NSvdqp03orHhaaLNhylhiYh2q9t
vLklmmolE6BZDuF/17tWegZkqLtTIQs2QuCkkaD0NWAab87pnXjdEg/vOSJsJ+38
w/Ysa/q++LyCFVcByaQ0UkyTuZ3qT94o7XZshfhK2iAJE2PxmT0=
=Q5Hq
-----END PGP SIGNATURE-----

--0Q/Ht7HQv8P8dMbf--