Skip to contentSkip to conversation

ALSA: hda: fix tegra build

PATCH In review Arnd Bergmann 2 participants 3 messages May 26, 2014 1 message not in the archive

Subsystems (2)
Sound Tegra architecture support
lore
Share & tools
lore

Arnd Bergmann

author
#0 lore raw

PATCH 1/1 ALSA: hda: fix tegra build

When CONFIG_PM is disabled, the CONFIG_SND_HDA_POWER_SAVE_DEFAULT symbol does not get defined, which causes a build error for the hda-tegra driver:

hda/hda_tegra.c:80:25: error: 'CONFIG_SND_HDA_POWER_SAVE_DEFAULT' undeclared here (not in a function)

 static int power_save = CONFIG_SND_HDA_POWER_SAVE_DEFAULT;
                         ^
/git/arm-soc/sound/pci/hda/hda_tegra.c:235:13: warning: 'hda_tegra_disable_clocks' defined but not used [-Wunused-function]
 static void hda_tegra_disable_clocks(struct hda_tegra *data)
             ^

This works around the problem by not referencing that macro when CONFIG_PM is disabled. Instead, we assume that it's disabled unconditionally and cannot be enabled at runtime.

Signed-off-by Dylan Reid <[email protected]>
Reviewed-by Stephen Warren <[email protected]>
Signed-off-by Takashi Iwai <[email protected]>
sound/pci/hda/hda_tegra.c +4 -0
index 086fd06..a366ba9 100644
@@ -77,10 +77,14 @@ struct hda_tegra {
 	void __iomem *regs;
 };
 
+#ifdef CONFIG_PM
 static int power_save = CONFIG_SND_HDA_POWER_SAVE_DEFAULT;
 module_param(power_save, bint, 0644);
 MODULE_PARM_DESC(power_save,
 		 "Automatic power-saving timeout (in seconds, 0 = disable).");
+#else
+static int power_save = 0;
+#endif
 
 /*
  * DMA page allocation ops.
#1 lore raw

At Mon, 26 May 2014 18:14:21 +0200,

Quoted 11 lines · Arnd Bergmann

When CONFIG_PM is disabled, the CONFIG_SND_HDA_POWER_SAVE_DEFAULT symbol does not get defined, which causes a build error for the hda-tegra driver:

hda/hda_tegra.c:80:25: error: 'CONFIG_SND_HDA_POWER_SAVE_DEFAULT' undeclared here (not in a function)

 static int power_save = CONFIG_SND_HDA_POWER_SAVE_DEFAULT;
                         ^
/git/arm-soc/sound/pci/hda/hda_tegra.c:235:13: warning: 'hda_tegra_disable_clocks' defined but not used [-Wunused-function]
 static void hda_tegra_disable_clocks(struct hda_tegra *data)
             ^
Quoted 7 lines

This works around the problem by not referencing that macro when CONFIG_PM is disabled. Instead, we assume that it's disabled unconditionally and cannot be enabled at runtime.

Signed-off-by Dylan Reid <[email protected]>
Reviewed-by Stephen Warren <[email protected]>
Signed-off-by Takashi Iwai <[email protected]>

Oh, you cloned me?

Takashi

Quoted 20 lines
sound/pci/hda/hda_tegra.c +4 -0
index 086fd06..a366ba9 100644
@@ -77,10 +77,14 @@ struct hda_tegra {
 	void __iomem *regs;
 };
 
+#ifdef CONFIG_PM
 static int power_save = CONFIG_SND_HDA_POWER_SAVE_DEFAULT;
 module_param(power_save, bint, 0644);
 MODULE_PARM_DESC(power_save,
 		 "Automatic power-saving timeout (in seconds, 0 = disable).");
+#else
+static int power_save = 0;
+#endif
 
 /*
  * DMA page allocation ops.

A message that is not in the archive (sent off-list or not yet received): s5h61ksjybu.wl%[email protected]

author
#3 lore raw
Quoted 17 lines · Takashi Iwai

At Mon, 26 May 2014 18:14:21 +0200,

Quoted 15 lines · Arnd Bergmann

When CONFIG_PM is disabled, the CONFIG_SND_HDA_POWER_SAVE_DEFAULT symbol does not get defined, which causes a build error for the hda-tegra driver:

hda/hda_tegra.c:80:25: error: 'CONFIG_SND_HDA_POWER_SAVE_DEFAULT' undeclared here (not in a function)

 static int power_save = CONFIG_SND_HDA_POWER_SAVE_DEFAULT;
                         ^
/git/arm-soc/sound/pci/hda/hda_tegra.c:235:13: warning: 'hda_tegra_disable_clocks' defined but not used [-Wunused-function]
 static void hda_tegra_disable_clocks(struct hda_tegra *data)
             ^

This works around the problem by not referencing that macro when CONFIG_PM is disabled. Instead, we assume that it's disabled unconditionally and cannot be enabled at runtime.

Quoted 6 lines
Quoted 3 lines
Signed-off-by Dylan Reid <[email protected]>
Reviewed-by Stephen Warren <[email protected]>
Signed-off-by Takashi Iwai <[email protected]>

Oh, you cloned me?

Damn, copy-paste error on my side. All three are wrong and should be Cc:, also my Signed-off-by is missing.

Let me resend.

Arnd