Linux Sound subsystem development
 help / color / mirror / Atom feed
* [PATCH] ASoC: cs42l43: Fix build error without CONFIG_PM
@ 2025-03-12 14:56 Takashi Iwai
  2025-03-12 15:07 ` Takashi Iwai
                   ` (2 more replies)
  0 siblings, 3 replies; 7+ messages in thread
From: Takashi Iwai @ 2025-03-12 14:56 UTC (permalink / raw)
  To: Mark Brown; +Cc: Maciej Strozek, Charles Keepax, patches, linux-sound

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);
 
-- 
2.43.0


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* Re: [PATCH] ASoC: cs42l43: Fix build error without CONFIG_PM
  2025-03-12 14:56 [PATCH] ASoC: cs42l43: Fix build error without CONFIG_PM Takashi Iwai
@ 2025-03-12 15:07 ` Takashi Iwai
  2025-03-12 15:11   ` Takashi Iwai
  2025-03-12 15:34 ` Mark Brown
  2025-03-12 15:48 ` Charles Keepax
  2 siblings, 1 reply; 7+ messages in thread
From: Takashi Iwai @ 2025-03-12 15:07 UTC (permalink / raw)
  To: Mark Brown; +Cc: Maciej Strozek, Charles Keepax, patches, linux-sound

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

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH] ASoC: cs42l43: Fix build error without CONFIG_PM
  2025-03-12 15:07 ` Takashi Iwai
@ 2025-03-12 15:11   ` Takashi Iwai
  0 siblings, 0 replies; 7+ messages in thread
From: Takashi Iwai @ 2025-03-12 15:11 UTC (permalink / raw)
  To: Mark Brown; +Cc: Maciej Strozek, Charles Keepax, patches, linux-sound

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

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH] ASoC: cs42l43: Fix build error without CONFIG_PM
  2025-03-12 14:56 [PATCH] ASoC: cs42l43: Fix build error without CONFIG_PM Takashi Iwai
  2025-03-12 15:07 ` Takashi Iwai
@ 2025-03-12 15:34 ` Mark Brown
  2025-03-12 15:37   ` Takashi Iwai
  2025-03-12 15:48 ` Charles Keepax
  2 siblings, 1 reply; 7+ messages in thread
From: Mark Brown @ 2025-03-12 15:34 UTC (permalink / raw)
  To: Takashi Iwai; +Cc: Maciej Strozek, Charles Keepax, patches, linux-sound

[-- Attachment #1: Type: text/plain, Size: 314 bytes --]

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...

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH] ASoC: cs42l43: Fix build error without CONFIG_PM
  2025-03-12 15:34 ` Mark Brown
@ 2025-03-12 15:37   ` Takashi Iwai
  0 siblings, 0 replies; 7+ messages in thread
From: Takashi Iwai @ 2025-03-12 15:37 UTC (permalink / raw)
  To: Mark Brown
  Cc: Takashi Iwai, Maciej Strozek, Charles Keepax, patches,
	linux-sound

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

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH] ASoC: cs42l43: Fix build error without CONFIG_PM
  2025-03-12 14:56 [PATCH] ASoC: cs42l43: Fix build error without CONFIG_PM Takashi Iwai
  2025-03-12 15:07 ` Takashi Iwai
  2025-03-12 15:34 ` Mark Brown
@ 2025-03-12 15:48 ` Charles Keepax
  2025-03-12 15:55   ` Takashi Iwai
  2 siblings, 1 reply; 7+ messages in thread
From: Charles Keepax @ 2025-03-12 15:48 UTC (permalink / raw)
  To: Takashi Iwai; +Cc: Mark Brown, Maciej Strozek, patches, linux-sound

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

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH] ASoC: cs42l43: Fix build error without CONFIG_PM
  2025-03-12 15:48 ` Charles Keepax
@ 2025-03-12 15:55   ` Takashi Iwai
  0 siblings, 0 replies; 7+ messages in thread
From: Takashi Iwai @ 2025-03-12 15:55 UTC (permalink / raw)
  To: Charles Keepax
  Cc: Takashi Iwai, Mark Brown, Maciej Strozek, patches, linux-sound

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

^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2025-03-12 15:55 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-03-12 14:56 [PATCH] ASoC: cs42l43: Fix build error without CONFIG_PM Takashi Iwai
2025-03-12 15:07 ` Takashi Iwai
2025-03-12 15:11   ` Takashi Iwai
2025-03-12 15:34 ` Mark Brown
2025-03-12 15:37   ` Takashi Iwai
2025-03-12 15:48 ` Charles Keepax
2025-03-12 15:55   ` Takashi Iwai

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox