These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / sound / pci / hda / hda_intel.h

diff --git a/kernel/sound/pci/hda/hda_intel.h b/kernel/sound/pci/hda/hda_intel.h
index d5231f7..ff0c4d6 100644 (file)
--- a/kernel/sound/pci/hda/hda_intel.h
+++ b/kernel/sound/pci/hda/hda_intel.h
@@ -16,7 +16,6 @@
 #ifndef __SOUND_HDA_INTEL_H
 #define __SOUND_HDA_INTEL_H
 
-#include <drm/i915_component.h>
 #include "hda_controller.h"
 
 struct hda_intel {
@@ -34,8 +33,9 @@ struct hda_intel {
 
        /* extra flags */
        unsigned int irq_pending_warned:1;
+       unsigned int probe_continued:1;
 
-       /* VGA-switcheroo setup */
+       /* vga_switcheroo setup */
        unsigned int use_vga_switcheroo:1;
        unsigned int vga_switcheroo_registered:1;
        unsigned int init_failed:1; /* delayed init failed */
@@ -43,29 +43,7 @@ struct hda_intel {
        /* secondary power domain for hdmi audio under vga device */
        struct dev_pm_domain hdmi_pm_domain;
 
-       /* i915 component interface */
-       struct i915_audio_component audio_component;
+       bool need_i915_power:1; /* the hda controller needs i915 power */
 };
 
-#ifdef CONFIG_SND_HDA_I915
-int hda_display_power(struct hda_intel *hda, bool enable);
-void haswell_set_bclk(struct hda_intel *hda);
-int hda_i915_init(struct hda_intel *hda);
-int hda_i915_exit(struct hda_intel *hda);
-#else
-static inline int hda_display_power(struct hda_intel *hda, bool enable)
-{
-       return 0;
-}
-static inline void haswell_set_bclk(struct hda_intel *hda) { return; }
-static inline int hda_i915_init(struct hda_intel *hda)
-{
-       return -ENODEV;
-}
-static inline int hda_i915_exit(struct hda_intel *hda)
-{
-       return 0;
-}
-#endif
-
 #endif