[v2,04/11] ALSA: hdac: Move 'to_hda_ext_device' helper to core

Commit Message

Subhransu S. Prusty Sept. 2, 2016, 11:04 a.m. UTC

This helper is also useful for generic codec framework. So moving
this to core for reuse.

Signed-off-by: Subhransu S. Prusty <[e-mail]>
Signed-off-by: Vinod Koul <[e-mail]>
---
 include/sound/hdaudio_ext.h  | 8 ++++++++
 sound/soc/codecs/hdac_hdmi.c | 8 +-------
 2 files changed, 9 insertions(+), 7 deletions(-)

Patch

diff --git a/include/sound/hdaudio_ext.h b/include/sound/hdaudio_ext.h
index 5be7a59..2113765 100644
--- a/include/sound/hdaudio_ext.h
+++ b/include/sound/hdaudio_ext.h
@@ -256,6 +256,14 @@  struct hdac_ext_dma_params {
 };
 #define to_ehdac_device(dev) (container_of((dev), \
 				 struct hdac_ext_device, hdac))
+
+static inline struct hdac_ext_device *to_hda_ext_device(struct device *dev)
+{
+	struct hdac_device *hdac = dev_to_hdac_dev(dev);
+
+	return to_ehdac_device(hdac);
+}
+
 /*
  * HD-audio codec base driver
  */
diff --git a/sound/soc/codecs/hdac_hdmi.c b/sound/soc/codecs/hdac_hdmi.c
index 4e181b2..8a9a5f8 100644
--- a/sound/soc/codecs/hdac_hdmi.c
+++ b/sound/soc/codecs/hdac_hdmi.c
@@ -30,6 +30,7 @@ 
 #include <sound/hda_i915.h>
 #include <sound/pcm_drm_eld.h>
 #include <sound/hda_chmap.h>
+#include <sound/hdaudio_ext.h>
 #include "../../hda/local.h"
 #include "hdac_hdmi.h"
 
@@ -127,13 +128,6 @@  static struct hdac_hdmi_pcm *get_hdmi_pcm_from_id(struct hdac_hdmi_priv *hdmi,
 	return NULL;
 }
 
-static inline struct hdac_ext_device *to_hda_ext_device(struct device *dev)
-{
-	struct hdac_device *hdac = dev_to_hdac_dev(dev);
-
-	return to_ehdac_device(hdac);
-}
-
 static unsigned int sad_format(const u8 *sad)
 {
 	return ((sad[0] >> 0x3) & 0x1f);