Merge branch 'topic/hda-link-time' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound into asoc-intel

3 files changed, 9 insertions, 9 deletions

diff --git a/sound/soc/intel/skylake/skl-messages.c b/sound/soc/intel/skylake/skl-messages.c
index 8a750b67273f..8eb5ba2dae3a 100644
--- a/sound/soc/intel/skylake/skl-messages.c
+++ b/sound/soc/intel/skylake/skl-messages.c
@@ -300,7 +300,7 @@ int skl_suspend_dsp(struct skl *skl)
         int ret;
 
         /* if ppcap is not supported return 0 */
-        if (!skl->ebus.ppcap)
+        if (!skl->ebus.bus.ppcap)
                 return 0;
 
         ret = skl_dsp_sleep(ctx->dsp);
@@ -320,7 +320,7 @@ int skl_resume_dsp(struct skl *skl)
         int ret;
 
         /* if ppcap is not supported return 0 */
-        if (!skl->ebus.ppcap)
+        if (!skl->ebus.bus.ppcap)
                 return 0;
 
         /* enable ppcap interrupt */
diff --git a/sound/soc/intel/skylake/skl-pcm.c b/sound/soc/intel/skylake/skl-pcm.c
index 22d4f0703a33..140249269cdb 100644
--- a/sound/soc/intel/skylake/skl-pcm.c
+++ b/sound/soc/intel/skylake/skl-pcm.c
@@ -106,7 +106,7 @@ static void skl_set_pcm_constrains(struct hdac_ext_bus *ebus,
 
 static enum hdac_ext_stream_type skl_get_host_stream_type(struct hdac_ext_bus *ebus)
 {
-        if (ebus->ppcap)
+        if ((ebus_to_hbus(ebus))->ppcap)
                 return HDAC_EXT_STREAM_TYPE_HOST;
         else
                 return HDAC_EXT_STREAM_TYPE_COUPLED;
@@ -188,7 +188,7 @@ static int skl_get_format(struct snd_pcm_substream *substream,
         struct hdac_ext_bus *ebus = dev_get_drvdata(dai->dev);
         int format_val = 0;
 
-        if (ebus->ppcap) {
+        if ((ebus_to_hbus(ebus))->ppcap) {
                 struct snd_pcm_runtime *runtime = substream->runtime;
 
                 format_val = snd_hdac_calc_stream_format(runtime->rate,
@@ -1020,7 +1020,7 @@ static int skl_platform_pcm_trigger(struct snd_pcm_substream *substream,
 {
         struct hdac_ext_bus *ebus = get_bus_ctx(substream);
 
-        if (!ebus->ppcap)
+        if ((ebus_to_hbus(ebus))->ppcap)
                 return skl_coupled_trigger(substream, cmd);
 
         return 0;
@@ -1146,7 +1146,7 @@ static int skl_platform_soc_probe(struct snd_soc_platform *platform)
         int ret;
 
         pm_runtime_get_sync(platform->dev);
-        if (ebus->ppcap) {
+        if ((ebus_to_hbus(ebus))->ppcap) {
                 ret = skl_tplg_init(platform, ebus);
                 if (ret < 0) {
                         dev_err(platform->dev, "Failed to init topology!\n");
diff --git a/sound/soc/intel/skylake/skl.c b/sound/soc/intel/skylake/skl.c
index cd59536a761d..a893ca13be8e 100644
--- a/sound/soc/intel/skylake/skl.c
+++ b/sound/soc/intel/skylake/skl.c
@@ -587,7 +587,7 @@ static int skl_first_init(struct hdac_ext_bus *ebus)
                 return -ENXIO;
         }
 
-        snd_hdac_ext_bus_parse_capabilities(ebus);
+        snd_hdac_bus_parse_capabilities(bus);
 
         if (skl_acquire_irq(ebus, 0) < 0)
                 return -EBUSY;
@@ -682,7 +682,7 @@ static int skl_probe(struct pci_dev *pci,
         skl_dmic_data.dmic_num = skl_get_dmic_geo(skl);
 
         /* check if dsp is there */
-        if (ebus->ppcap) {
+        if (bus->ppcap) {
                 err = skl_machine_device_register(skl,
                                   (void *)pci_id->driver_data);
                 if (err < 0)
@@ -696,7 +696,7 @@ static int skl_probe(struct pci_dev *pci,
                 skl->skl_sst->enable_miscbdcge = skl_enable_miscbdcge;
 
         }
-        if (ebus->mlcap)
+        if (bus->mlcap)
                 snd_hdac_ext_bus_get_ml_capabilities(ebus);
 
         /* create device for soc dmic */