Received-SPF: pass (google.com: domain of linux-kernel+bounces-7875-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
Date: Thu, 21 Dec 2023 16:58:05 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Lee Jones <lee@kernel.org>, Thierry Reding <thierry.reding@gmail.com>
Cc: Sean Young <sean@mess.org>, 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: linux-next: build failure after merge of the pwm tree
Message-ID: <20231221165805.0c4771c1@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/V1ol2N+FvGoGBHhVCu54mCy";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/V1ol2N+FvGoGBHhVCu54mCy
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

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 fu=
nction 'pwm_apply_state'; did you mean 'pwm_apply_args'? [-Werror=3Dimplici=
t-function-declaration]
  134 |                 ret =3D 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 MP3309=
C"

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/mp=
3309c.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_de=
vice *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");
--=20
2.43.0

--=20
Cheers,
Stephen Rothwell

--Sig_/V1ol2N+FvGoGBHhVCu54mCy
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmWD0+0ACgkQAVBC80lX
0Gwpcgf/QoObjAEU4FGHKar8ldO1j/e87uJFegGqZXmSYkUNnDT6CkOdSG5Csk0u
q6AIBGqQML5cuG/QFgLaNtg+7ZvbwfG5kzAXUYJG9MTWLp7GHXO/omSsnvNmZBwe
//prFdmkw90HwIigWCS6PpBq9QxbJW6bTzVd/56QLsKxy6a7SaEwL/TLFNMpRWBR
N5kVBXf07veREM39cqmLBL/JtawQTziLhw+gX2Zb3e3yBVGcaz88j2C9od8BuLMI
kqutrcehxIOe0in/GG3/sES+/tAzsECjZkYy5xMB7yJYrQ1ngfnfYVbpA8B/X7qf
QpLp2I4aUSyMVGQfiEtf9sKrX/VKDg==
=Vrbr
-----END PGP SIGNATURE-----

--Sig_/V1ol2N+FvGoGBHhVCu54mCy--