When building with CONFIG_SND_HDA_I915=n, I get the following warning:
sound/pci/hda/hda_intel.c: In function ‘azx_probe_continue’:
sound/pci/hda/hda_intel.c:1882:2: warning: label ‘skip_i915’ defined but not
used [-Wunused-label]
skip_i915:
^
Fix this by using 'if (IS_ENABLED())' rather than #ifdef.
Signed-off-by: Frans Klaver <frans.kla...@xsens.com>
---
sound/pci/hda/hda_intel.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index a244ba706317..d85a53ceab6d 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -1856,8 +1856,8 @@ static int azx_probe_continue(struct azx *chip)
int err;
/* Request power well for Haswell HDA controller and codec */
- if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL) {
-#ifdef CONFIG_SND_HDA_I915
+ if (IS_ENABLED(CONFIG_SND_HDA_I915) &&
+ chip->driver_caps & AZX_DCAPS_I915_POWERWELL) {
err = hda_i915_init(hda);
if (err < 0) {
/* if the controller is bound only with HDMI/DP
@@ -1876,7 +1876,6 @@ static int azx_probe_continue(struct azx *chip)
"Cannot turn on display power on i915\n");
goto out_free;
}
-#endif
}
skip_i915:
--
2.3.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
