summaryrefslogtreecommitdiffstats
path: root/sound/pci/hda/hda_intel.h
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2015-04-30 08:22:41 +0200
committerTakashi Iwai <tiwai@suse.de>2015-04-30 08:22:41 +0200
commit31c648e0d304bbfc49a4a22c6139718367f3fd8d (patch)
tree5a335414d328dcb0f3279263671423f941c7ac29 /sound/pci/hda/hda_intel.h
parent2bd1f73f4242ee19d8c610bcffe6e7a813451ce0 (diff)
downloadtalos-op-linux-31c648e0d304bbfc49a4a22c6139718367f3fd8d.tar.gz
talos-op-linux-31c648e0d304bbfc49a4a22c6139718367f3fd8d.zip
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 <fengguang.wu@intel.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/hda_intel.h')
-rw-r--r--sound/pci/hda/hda_intel.h2
1 files changed, 1 insertions, 1 deletions
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)
{
OpenPOWER on IntegriCloud