ALSA: interwave: fix build warnings with CONFIG_PM=n

[PATCH] ALSA: interwave: fix build warnings with CONFIG_PM=n

Posted by Arnd Bergmann 2 months ago

From: Arnd Bergmann <arnd@arndb.de>

Parts of the newly added power management code are identified
as unused by gcc:

sound/isa/gus/interwave.c:489:13: error: 'snd_interwave_restore_memory' defined but not used [-Werror=unused-function]
  489 | static void snd_interwave_restore_memory(struct snd_gus_card *gus)
      |             ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
sound/isa/gus/interwave.c:483:13: error: 'snd_interwave_restore_regs' defined but not used [-Werror=unused-function]
  483 | static void snd_interwave_restore_regs(struct snd_gus_card *gus)
      |             ^~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from sound/isa/gus/interwave-stb.c:3:
sound/isa/gus/interwave.c:489:13: error: 'snd_interwave_restore_memory' defined but not used [-Werror=unused-function]
  489 | static void snd_interwave_restore_memory(struct snd_gus_card *gus)
      |             ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
sound/isa/gus/interwave.c:483:13: error: 'snd_interwave_restore_regs' defined but not used [-Werror=unused-function]
  483 | static void snd_interwave_restore_regs(struct snd_gus_card *gus)
      |             ^~~~~~~~~~~~~~~~~~~~~~~~~~

Add an #ifdef check around these to match the callers.

Fixes: 6f800c3397b7 ("ALSA: interwave: add ISA and PnP suspend and resume callbacks")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 sound/isa/gus/interwave.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sound/isa/gus/interwave.c b/sound/isa/gus/interwave.c
index 616c11e51a2f..bd13350038d2 100644
--- a/sound/isa/gus/interwave.c
+++ b/sound/isa/gus/interwave.c
@@ -480,6 +480,7 @@ static void __snd_interwave_restore_regs(struct snd_gus_card *gus)
 	snd_gf1_write8(gus, SNDRV_GF1_GB_EMULATION_IRQ, 0x00);
 }
 
+#ifdef CONFIG_PM
 static void snd_interwave_restore_regs(struct snd_gus_card *gus)
 {
 	scoped_guard(spinlock_irqsave, &gus->reg_lock)
@@ -517,6 +518,7 @@ static void snd_interwave_restore_memory(struct snd_gus_card *gus)
 		snd_gf1_write16(gus, SNDRV_GF1_GW_MEMORY_CONFIG, mem_cfg);
 	}
 }
+#endif
 
 static void snd_interwave_init(int dev, struct snd_gus_card *gus)
 {
-- 
2.39.5

Re: [PATCH] ALSA: interwave: fix build warnings with CONFIG_PM=n

Posted by Takashi Iwai 2 months ago

On Mon, 13 Apr 2026 09:12:11 +0200,
Arnd Bergmann wrote:
> 
> From: Arnd Bergmann <arnd@arndb.de>
> 
> Parts of the newly added power management code are identified
> as unused by gcc:
> 
> sound/isa/gus/interwave.c:489:13: error: 'snd_interwave_restore_memory' defined but not used [-Werror=unused-function]
>   489 | static void snd_interwave_restore_memory(struct snd_gus_card *gus)
>       |             ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
> sound/isa/gus/interwave.c:483:13: error: 'snd_interwave_restore_regs' defined but not used [-Werror=unused-function]
>   483 | static void snd_interwave_restore_regs(struct snd_gus_card *gus)
>       |             ^~~~~~~~~~~~~~~~~~~~~~~~~~
> In file included from sound/isa/gus/interwave-stb.c:3:
> sound/isa/gus/interwave.c:489:13: error: 'snd_interwave_restore_memory' defined but not used [-Werror=unused-function]
>   489 | static void snd_interwave_restore_memory(struct snd_gus_card *gus)
>       |             ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
> sound/isa/gus/interwave.c:483:13: error: 'snd_interwave_restore_regs' defined but not used [-Werror=unused-function]
>   483 | static void snd_interwave_restore_regs(struct snd_gus_card *gus)
>       |             ^~~~~~~~~~~~~~~~~~~~~~~~~~
> 
> Add an #ifdef check around these to match the callers.
> 
> Fixes: 6f800c3397b7 ("ALSA: interwave: add ISA and PnP suspend and resume callbacks")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Thanks, this should have been already fixed on sound git tree by the
commit b7feba842c0d5f6c5b01592f80d164e974767501
    ALSA: interwave: guard PM-only restore helpers with CONFIG_PM


Takashi