ASoC: meson: use helper function

Current ASoC has many helper function.
This patch use it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: Jerome Brunet <jbrunet@baylibre.com>
Link: https://lore.kernel.org/r/87r0vbea3r.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/meson/aiu-fifo-i2s.c b/sound/soc/meson/aiu-fifo-i2s.c
index 57e6e71..59e00a7 100644 (file)
--- a/sound/soc/meson/aiu-fifo-i2s.c
+++ b/sound/soc/meson/aiu-fifo-i2s.c
@@ -88,7 +88,7 @@ static int aiu_fifo_i2s_hw_params(struct snd_pcm_substream *substream,
                                  struct snd_soc_dai *dai)
 {
        struct snd_soc_component *component = dai->component;
-       struct aiu_fifo *fifo = dai->playback_dma_data;
+       struct aiu_fifo *fifo = snd_soc_dai_dma_data_get_playback(dai);
        unsigned int val;
        int ret;
 
@@ -158,7 +158,7 @@ int aiu_fifo_i2s_dai_probe(struct snd_soc_dai *dai)
        if (ret)
                return ret;
 
-       fifo = dai->playback_dma_data;
+       fifo = snd_soc_dai_dma_data_get_playback(dai);
 
        fifo->pcm = &fifo_i2s_pcm;
        fifo->mem_offset = AIU_MEM_I2S_START;

diff --git a/sound/soc/meson/aiu-fifo-spdif.c b/sound/soc/meson/aiu-fifo-spdif.c
index 2fb30f8..ddbd2fc 100644 (file)
--- a/sound/soc/meson/aiu-fifo-spdif.c
+++ b/sound/soc/meson/aiu-fifo-spdif.c
@@ -173,7 +173,7 @@ int aiu_fifo_spdif_dai_probe(struct snd_soc_dai *dai)
        if (ret)
                return ret;
 
-       fifo = dai->playback_dma_data;
+       fifo = snd_soc_dai_dma_data_get_playback(dai);
 
        fifo->pcm = &fifo_spdif_pcm;
        fifo->mem_offset = AIU_MEM_IEC958_START;

diff --git a/sound/soc/meson/aiu-fifo.c b/sound/soc/meson/aiu-fifo.c
index d67ff4c..543d418 100644 (file)
--- a/sound/soc/meson/aiu-fifo.c
+++ b/sound/soc/meson/aiu-fifo.c
@@ -34,7 +34,7 @@ snd_pcm_uframes_t aiu_fifo_pointer(struct snd_soc_component *component,
                                   struct snd_pcm_substream *substream)
 {
        struct snd_soc_dai *dai = aiu_fifo_dai(substream);
-       struct aiu_fifo *fifo = dai->playback_dma_data;
+       struct aiu_fifo *fifo = snd_soc_dai_dma_data_get_playback(dai);
        struct snd_pcm_runtime *runtime = substream->runtime;
        unsigned int addr;
 
@@ -46,7 +46,7 @@ snd_pcm_uframes_t aiu_fifo_pointer(struct snd_soc_component *component,
 static void aiu_fifo_enable(struct snd_soc_dai *dai, bool enable)
 {
        struct snd_soc_component *component = dai->component;
-       struct aiu_fifo *fifo = dai->playback_dma_data;
+       struct aiu_fifo *fifo = snd_soc_dai_dma_data_get_playback(dai);
        unsigned int en_mask = (AIU_MEM_CONTROL_FILL_EN |
                                AIU_MEM_CONTROL_EMPTY_EN);
 
@@ -80,7 +80,7 @@ int aiu_fifo_prepare(struct snd_pcm_substream *substream,
                     struct snd_soc_dai *dai)
 {
        struct snd_soc_component *component = dai->component;
-       struct aiu_fifo *fifo = dai->playback_dma_data;
+       struct aiu_fifo *fifo = snd_soc_dai_dma_data_get_playback(dai);
 
        snd_soc_component_update_bits(component,
                                      fifo->mem_offset + AIU_MEM_CONTROL,
@@ -98,7 +98,7 @@ int aiu_fifo_hw_params(struct snd_pcm_substream *substream,
 {
        struct snd_pcm_runtime *runtime = substream->runtime;
        struct snd_soc_component *component = dai->component;
-       struct aiu_fifo *fifo = dai->playback_dma_data;
+       struct aiu_fifo *fifo = snd_soc_dai_dma_data_get_playback(dai);
        dma_addr_t end;
 
        /* Setup the fifo boundaries */
@@ -132,7 +132,7 @@ static irqreturn_t aiu_fifo_isr(int irq, void *dev_id)
 int aiu_fifo_startup(struct snd_pcm_substream *substream,
                     struct snd_soc_dai *dai)
 {
-       struct aiu_fifo *fifo = dai->playback_dma_data;
+       struct aiu_fifo *fifo = snd_soc_dai_dma_data_get_playback(dai);
        int ret;
 
        snd_soc_set_runtime_hwparams(substream, fifo->pcm);
@@ -168,7 +168,7 @@ int aiu_fifo_startup(struct snd_pcm_substream *substream,
 void aiu_fifo_shutdown(struct snd_pcm_substream *substream,
                       struct snd_soc_dai *dai)
 {
-       struct aiu_fifo *fifo = dai->playback_dma_data;
+       struct aiu_fifo *fifo = snd_soc_dai_dma_data_get_playback(dai);
 
        free_irq(fifo->irq, substream);
        clk_disable_unprepare(fifo->pclk);
@@ -178,7 +178,7 @@ int aiu_fifo_pcm_new(struct snd_soc_pcm_runtime *rtd,
                     struct snd_soc_dai *dai)
 {
        struct snd_card *card = rtd->card->snd_card;
-       struct aiu_fifo *fifo = dai->playback_dma_data;
+       struct aiu_fifo *fifo = snd_soc_dai_dma_data_get_playback(dai);
        size_t size = fifo->pcm->buffer_bytes_max;
        int ret;
 
@@ -200,15 +200,16 @@ int aiu_fifo_dai_probe(struct snd_soc_dai *dai)
        if (!fifo)
                return -ENOMEM;
 
-       dai->playback_dma_data = fifo;
+       snd_soc_dai_dma_data_set_playback(dai, fifo);
 
        return 0;
 }
 
 int aiu_fifo_dai_remove(struct snd_soc_dai *dai)
 {
-       kfree(dai->playback_dma_data);
+       struct aiu_fifo *fifo = snd_soc_dai_dma_data_get_playback(dai);
+
+       kfree(fifo);
 
        return 0;
 }
-

diff --git a/sound/soc/meson/axg-tdm-interface.c b/sound/soc/meson/axg-tdm-interface.c
index c040c83..7624aaf 100644 (file)
--- a/sound/soc/meson/axg-tdm-interface.c
+++ b/sound/soc/meson/axg-tdm-interface.c
@@ -37,10 +37,8 @@ int axg_tdm_set_tdm_slots(struct snd_soc_dai *dai, u32 *tx_mask,
                          unsigned int slot_width)
 {
        struct axg_tdm_iface *iface = snd_soc_dai_get_drvdata(dai);
-       struct axg_tdm_stream *tx = (struct axg_tdm_stream *)
-               dai->playback_dma_data;
-       struct axg_tdm_stream *rx = (struct axg_tdm_stream *)
-               dai->capture_dma_data;
+       struct axg_tdm_stream *tx = snd_soc_dai_dma_data_get_playback(dai);
+       struct axg_tdm_stream *rx = snd_soc_dai_dma_data_get_capture(dai);
        unsigned int tx_slots, rx_slots;
        unsigned int fmt = 0;
 
@@ -362,11 +360,14 @@ static int axg_tdm_iface_prepare(struct snd_pcm_substream *substream,
 
 static int axg_tdm_iface_remove_dai(struct snd_soc_dai *dai)
 {
-       if (dai->capture_dma_data)
-               axg_tdm_stream_free(dai->capture_dma_data);
+       int stream;
 
-       if (dai->playback_dma_data)
-               axg_tdm_stream_free(dai->playback_dma_data);
+       for_each_pcm_streams(stream) {
+               struct axg_tdm_stream *ts = snd_soc_dai_dma_data_get(dai, stream);
+
+               if (ts)
+                       axg_tdm_stream_free(ts);
+       }
 
        return 0;
 }
@@ -374,19 +375,20 @@ static int axg_tdm_iface_remove_dai(struct snd_soc_dai *dai)
 static int axg_tdm_iface_probe_dai(struct snd_soc_dai *dai)
 {
        struct axg_tdm_iface *iface = snd_soc_dai_get_drvdata(dai);
+       int stream;
 
-       if (dai->capture_widget) {
-               dai->capture_dma_data = axg_tdm_stream_alloc(iface);
-               if (!dai->capture_dma_data)
-                       return -ENOMEM;
-       }
+       for_each_pcm_streams(stream) {
+               struct axg_tdm_stream *ts;
+
+               if (!snd_soc_dai_get_widget(dai, stream))
+                       continue;
 
-       if (dai->playback_widget) {
-               dai->playback_dma_data = axg_tdm_stream_alloc(iface);
-               if (!dai->playback_dma_data) {
+               ts = axg_tdm_stream_alloc(iface);
+               if (!ts) {
                        axg_tdm_iface_remove_dai(dai);
                        return -ENOMEM;
                }
+               snd_soc_dai_dma_data_set(dai, stream, ts);
        }
 
        return 0;

diff --git a/sound/soc/meson/axg-tdmin.c b/sound/soc/meson/axg-tdmin.c
index 49b613a..c8f6ea2 100644 (file)
--- a/sound/soc/meson/axg-tdmin.c
+++ b/sound/soc/meson/axg-tdmin.c
@@ -83,7 +83,7 @@ axg_tdmin_get_tdm_stream(struct snd_soc_dapm_widget *w)
        if (!be)
                return NULL;
 
-       return be->capture_dma_data;
+       return snd_soc_dai_dma_data_get_capture(be);
 }
 
 static void axg_tdmin_enable(struct regmap *map)

diff --git a/sound/soc/meson/axg-tdmout.c b/sound/soc/meson/axg-tdmout.c
index 22d519f..c4039e4 100644 (file)
--- a/sound/soc/meson/axg-tdmout.c
+++ b/sound/soc/meson/axg-tdmout.c
@@ -81,7 +81,7 @@ axg_tdmout_get_tdm_stream(struct snd_soc_dapm_widget *w)
        if (!be)
                return NULL;
 
-       return be->playback_dma_data;
+       return snd_soc_dai_dma_data_get_playback(be);
 }
 
 static void axg_tdmout_enable(struct regmap *map)

diff --git a/sound/soc/meson/meson-codec-glue.c b/sound/soc/meson/meson-codec-glue.c
index 80c5ed1..5913486 100644 (file)
--- a/sound/soc/meson/meson-codec-glue.c
+++ b/sound/soc/meson/meson-codec-glue.c
@@ -39,13 +39,13 @@ meson_codec_glue_get_input(struct snd_soc_dapm_widget *w)
 static void meson_codec_glue_input_set_data(struct snd_soc_dai *dai,
                                            struct meson_codec_glue_input *data)
 {
-       dai->playback_dma_data = data;
+       snd_soc_dai_dma_data_set_playback(dai, data);
 }
 
 struct meson_codec_glue_input *
 meson_codec_glue_input_get_data(struct snd_soc_dai *dai)
 {
-       return dai->playback_dma_data;
+       return snd_soc_dai_dma_data_get_playback(dai);
 }
 EXPORT_SYMBOL_GPL(meson_codec_glue_input_get_data);
 
@@ -99,8 +99,8 @@ int meson_codec_glue_output_startup(struct snd_pcm_substream *substream,
                                    struct snd_soc_dai *dai)
 {
        struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);
-       struct meson_codec_glue_input *in_data =
-               meson_codec_glue_output_get_input_data(dai->capture_widget);
+       struct snd_soc_dapm_widget *w = snd_soc_dai_get_widget_capture(dai);
+       struct meson_codec_glue_input *in_data = meson_codec_glue_output_get_input_data(w);
 
        if (!in_data)
                return -ENODEV;