diff options
author | Mark Brown <broonie@kernel.org> | 2018-08-01 10:32:05 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2018-08-01 10:32:05 +0100 |
commit | a0b5031582c38f6e2685f7ab9bb0a4168e2a5d1b (patch) | |
tree | 371e79c07ec8700c378b8bd855fcd12a447c6e87 /sound/soc/intel/skylake/skl-topology.h | |
parent | c8cb5f775c8dacb605e628a320ded42be3bd9453 (diff) | |
parent | a57942bfdd61b46df94021c9c33b8faaae5b65e1 (diff) |
Merge branch 'topic/drm_audio_component' of https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound into asoc-4.19
Diffstat (limited to 'sound/soc/intel/skylake/skl-topology.h')
-rw-r--r-- | sound/soc/intel/skylake/skl-topology.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/intel/skylake/skl-topology.h b/sound/soc/intel/skylake/skl-topology.h index af198ea0379e..82282cac9751 100644 --- a/sound/soc/intel/skylake/skl-topology.h +++ b/sound/soc/intel/skylake/skl-topology.h @@ -458,9 +458,9 @@ enum skl_channel { static inline struct skl *get_skl_ctx(struct device *dev) { - struct hdac_ext_bus *ebus = dev_get_drvdata(dev); + struct hdac_bus *bus = dev_get_drvdata(dev); - return ebus_to_skl(ebus); + return bus_to_skl(bus); } int skl_tplg_be_update_params(struct snd_soc_dai *dai, @@ -470,7 +470,7 @@ int skl_dsp_set_dma_control(struct skl_sst *ctx, u32 *caps, void skl_tplg_set_be_dmic_config(struct snd_soc_dai *dai, struct skl_pipe_params *params, int stream); int skl_tplg_init(struct snd_soc_component *component, - struct hdac_ext_bus *ebus); + struct hdac_bus *ebus); struct skl_module_cfg *skl_tplg_fe_get_cpr_module( struct snd_soc_dai *dai, int stream); int skl_tplg_update_pipe_params(struct device *dev, |