| Message ID | 20250312145642.26646-1-tiwai@suse.de (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | ASoC: cs42l43: Fix build error without CONFIG_PM | expand |
On Wed, 12 Mar 2025 15:56:39 +0100, Takashi Iwai wrote: > > Put __maybe_unused to work around the build error without CONFIG_PM > or CONFIG_PM_SLEEP for the newly defined system suspend callback. I think a better alternative would be to wrap with pm_sleep_ptr(). Will resubmit. Takashi
On Wed, 12 Mar 2025 16:07:51 +0100, Takashi Iwai wrote: > > On Wed, 12 Mar 2025 15:56:39 +0100, > Takashi Iwai wrote: > > > > Put __maybe_unused to work around the build error without CONFIG_PM > > or CONFIG_PM_SLEEP for the newly defined system suspend callback. > > I think a better alternative would be to wrap with pm_sleep_ptr(). > Will resubmit. ... and no, it won't work together with SET_SYSTEM_SLEEP_PM_OPS() :-< So this patch should be the easiest fix, I suppose. Takashi
On Wed, Mar 12, 2025 at 03:56:39PM +0100, Takashi Iwai wrote: > Put __maybe_unused to work around the build error without CONFIG_PM > or CONFIG_PM_SLEEP for the newly defined system suspend callback. Reviewed-by: Mark Brown <broonie@kernel.org> I'm kind of surprised none of the build bot people noticed this...
On Wed, 12 Mar 2025 16:34:04 +0100, Mark Brown wrote: > > On Wed, Mar 12, 2025 at 03:56:39PM +0100, Takashi Iwai wrote: > > Put __maybe_unused to work around the build error without CONFIG_PM > > or CONFIG_PM_SLEEP for the newly defined system suspend callback. > > Reviewed-by: Mark Brown <broonie@kernel.org> > > I'm kind of surprised none of the build bot people noticed this... Would you just apply and send a new PR later? I didn't merge your previous PR yet. thanks, Takashi
On Wed, Mar 12, 2025 at 03:56:39PM +0100, Takashi Iwai wrote: > Put __maybe_unused to work around the build error without CONFIG_PM > or CONFIG_PM_SLEEP for the newly defined system suspend callback. > > Fixes: 164b7dd4546b ("ASoC: cs42l43: Add jack delay debounce after suspend") > Signed-off-by: Takashi Iwai <tiwai@suse.de> > --- > sound/soc/codecs/cs42l43.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/sound/soc/codecs/cs42l43.c b/sound/soc/codecs/cs42l43.c > index d307b56a7f38..4c7a598f5e73 100644 > --- a/sound/soc/codecs/cs42l43.c > +++ b/sound/soc/codecs/cs42l43.c > @@ -2402,7 +2402,7 @@ static int cs42l43_codec_runtime_resume(struct device *dev) > return 0; > } > > -static int cs42l43_codec_runtime_force_suspend(struct device *dev) > +static int __maybe_unused cs42l43_codec_runtime_force_suspend(struct device *dev) > { > struct cs42l43_codec *priv = dev_get_drvdata(dev); I believe this should already be fixed by this patch: https://patch.msgid.link/20250305172738.3437513-1-arnd@kernel.org Which is probably a better fix as well. Thanks, Charles
On Wed, 12 Mar 2025 16:48:21 +0100, Charles Keepax wrote: > > On Wed, Mar 12, 2025 at 03:56:39PM +0100, Takashi Iwai wrote: > > Put __maybe_unused to work around the build error without CONFIG_PM > > or CONFIG_PM_SLEEP for the newly defined system suspend callback. > > > > Fixes: 164b7dd4546b ("ASoC: cs42l43: Add jack delay debounce after suspend") > > Signed-off-by: Takashi Iwai <tiwai@suse.de> > > --- > > sound/soc/codecs/cs42l43.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/sound/soc/codecs/cs42l43.c b/sound/soc/codecs/cs42l43.c > > index d307b56a7f38..4c7a598f5e73 100644 > > --- a/sound/soc/codecs/cs42l43.c > > +++ b/sound/soc/codecs/cs42l43.c > > @@ -2402,7 +2402,7 @@ static int cs42l43_codec_runtime_resume(struct device *dev) > > return 0; > > } > > > > -static int cs42l43_codec_runtime_force_suspend(struct device *dev) > > +static int __maybe_unused cs42l43_codec_runtime_force_suspend(struct device *dev) > > { > > struct cs42l43_codec *priv = dev_get_drvdata(dev); > > I believe this should already be fixed by this patch: > > https://patch.msgid.link/20250305172738.3437513-1-arnd@kernel.org > > Which is probably a better fix as well. Ah that's the one I looked for. Yes, SYSTEM_SLEEP_PM_OPS() is a better choice. thanks, Takashi
diff --git a/sound/soc/codecs/cs42l43.c b/sound/soc/codecs/cs42l43.c index d307b56a7f38..4c7a598f5e73 100644 --- a/sound/soc/codecs/cs42l43.c +++ b/sound/soc/codecs/cs42l43.c @@ -2402,7 +2402,7 @@ static int cs42l43_codec_runtime_resume(struct device *dev) return 0; } -static int cs42l43_codec_runtime_force_suspend(struct device *dev) +static int __maybe_unused cs42l43_codec_runtime_force_suspend(struct device *dev) { struct cs42l43_codec *priv = dev_get_drvdata(dev);
Put __maybe_unused to work around the build error without CONFIG_PM or CONFIG_PM_SLEEP for the newly defined system suspend callback. Fixes: 164b7dd4546b ("ASoC: cs42l43: Add jack delay debounce after suspend") Signed-off-by: Takashi Iwai <tiwai@suse.de> --- sound/soc/codecs/cs42l43.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)