ASoC: Intel: avs: Store pointer to adev in DAI dma_data

Reduce the number of to_avs_dev() casts by storing the driver context in
DAI's dma_data.

Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com>
Link: https://lore.kernel.org/r/20240426095733.3946951-5-cezary.rojewski@intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/intel/avs/pcm.c b/sound/soc/intel/avs/pcm.c
index 23f7e0fae8174c0eda87d66d5d9ec6bcc6e4a07a..a3a04115216c8e1c3d537b3b5bb25d48ecd7f22b 100644 (file)
--- a/sound/soc/intel/avs/pcm.c
+++ b/sound/soc/intel/avs/pcm.c
@@ -22,6 +22,7 @@
 struct avs_dma_data {
        struct avs_tplg_path_template *template;
        struct avs_path *path;
+       struct avs_dev *adev;
        /*
         * link stream is stored within substream's runtime
         * private_data to fulfill the needs of codec BE path
@@ -60,7 +61,7 @@ static int avs_dai_startup(struct snd_pcm_substream *substream, struct snd_soc_d
                           const struct snd_soc_dai_ops *ops)
 {
        struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);
-       struct avs_dev *adev = to_avs_dev(dai->dev);
+       struct avs_dev *adev = to_avs_dev(dai->component->dev);
        struct avs_tplg_path_template *template;
        struct avs_dma_data *data;
 
@@ -77,6 +78,7 @@ static int avs_dai_startup(struct snd_pcm_substream *substream, struct snd_soc_d
 
        data->substream = substream;
        data->template = template;
+       data->adev = adev;
        snd_soc_dai_set_dma_data(dai, substream, data);
 
        if (rtd->dai_link->ignore_suspend)
@@ -88,13 +90,12 @@ static int avs_dai_startup(struct snd_pcm_substream *substream, struct snd_soc_d
 static void avs_dai_shutdown(struct snd_pcm_substream *substream, struct snd_soc_dai *dai)
 {
        struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);
-       struct avs_dev *adev = to_avs_dev(dai->dev);
        struct avs_dma_data *data;
 
        data = snd_soc_dai_get_dma_data(dai, substream);
 
        if (rtd->dai_link->ignore_suspend)
-               adev->num_lp_paths--;
+               data->adev->num_lp_paths--;
 
        snd_soc_dai_set_dma_data(dai, substream, NULL);
        kfree(data);
@@ -107,7 +108,6 @@ static int avs_dai_hw_params(struct snd_pcm_substream *substream,
 {
        struct avs_dma_data *data;
        struct avs_path *path;
-       struct avs_dev *adev = to_avs_dev(dai->dev);
        int ret;
 
        data = snd_soc_dai_get_dma_data(dai, substream);
@@ -124,7 +124,7 @@ static int avs_dai_hw_params(struct snd_pcm_substream *substream,
                params_rate(be_hw_params), params_channels(be_hw_params),
                params_width(be_hw_params), params_physical_width(be_hw_params));
 
-       path = avs_path_create(adev, dma_id, data->template, fe_hw_params, be_hw_params);
+       path = avs_path_create(data->adev, dma_id, data->template, fe_hw_params, be_hw_params);
        if (IS_ERR(path)) {
                ret = PTR_ERR(path);
                dev_err(dai->dev, "create path failed: %d\n", ret);
@@ -505,8 +505,7 @@ static int avs_dai_fe_startup(struct snd_pcm_substream *substream, struct snd_so
 {
        struct snd_pcm_runtime *runtime = substream->runtime;
        struct avs_dma_data *data;
-       struct avs_dev *adev = to_avs_dev(dai->dev);
-       struct hdac_bus *bus = &adev->base.core;
+       struct hdac_bus *bus;
        struct hdac_ext_stream *host_stream;
        int ret;
 
@@ -515,6 +514,7 @@ static int avs_dai_fe_startup(struct snd_pcm_substream *substream, struct snd_so
                return ret;
 
        data = snd_soc_dai_get_dma_data(dai, substream);
+       bus = &data->adev->base.core;
 
        host_stream = snd_hdac_ext_stream_assign(bus, substream, HDAC_EXT_STREAM_TYPE_HOST);
        if (!host_stream) {
@@ -655,7 +655,6 @@ static int avs_dai_fe_prepare(struct snd_pcm_substream *substream, struct snd_so
        struct snd_pcm_runtime *runtime = substream->runtime;
        struct snd_soc_pcm_stream *stream_info;
        struct avs_dma_data *data;
-       struct avs_dev *adev = to_avs_dev(dai->dev);
        struct hdac_ext_stream *host_stream;
        unsigned int format_val;
        struct hdac_bus *bus;
@@ -685,7 +684,7 @@ static int avs_dai_fe_prepare(struct snd_pcm_substream *substream, struct snd_so
        if (ret < 0)
                return ret;
 
-       ret = avs_dai_prepare(adev, substream, dai);
+       ret = avs_dai_prepare(data->adev, substream, dai);
        if (ret)
                return ret;