From 31c648e0d304bbfc49a4a22c6139718367f3fd8d Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Thu, 30 Apr 2015 08:22:41 +0200 Subject: ALSA: hda - Reduce ifdef CONFIG_SND_HDA_I915 We're providing dummy functions for CONFIG_SND_HDA_i915=n, thus ifdef can be reduced. (But hda_i915_init() has to be fixed to return zero.) This automatically fixes a compile warning: sound/pci/hda/hda_intel.c: In function 'azx_probe_continue': sound/pci/hda/hda_intel.c:1966:1: warning: label 'i915_power_fail' defined but not used [-Wunused-label] Reported-by: kbuild test robot Signed-off-by: Takashi Iwai --- sound/pci/hda/hda_intel.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sound/pci/hda/hda_intel.h') diff --git a/sound/pci/hda/hda_intel.h b/sound/pci/hda/hda_intel.h index 505f987eb4a2..ff41fc30091d 100644 --- a/sound/pci/hda/hda_intel.h +++ b/sound/pci/hda/hda_intel.h @@ -63,7 +63,7 @@ static inline int hda_display_power(struct hda_intel *hda, bool enable) static inline void haswell_set_bclk(struct hda_intel *hda) { return; } static inline int hda_i915_init(struct hda_intel *hda) { - return -ENODEV; + return 0; } static inline int hda_i915_exit(struct hda_intel *hda) { -- cgit v1.2.3