ASoC: codec: wm_adsp: use snd_compress_ops

We can use snd_compress_ops.
Let's switch to use it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Tested-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Acked-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/87tv1evdlu.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/cs47l15.c b/sound/soc/codecs/cs47l15.c
index 8d1869b..402c6b7 100644 (file)
--- a/sound/soc/codecs/cs47l15.c
+++ b/sound/soc/codecs/cs47l15.c
@@ -1229,11 +1229,10 @@ static struct snd_soc_dai_driver cs47l15_dai[] = {
        },
 };
 
-static int cs47l15_open(struct snd_compr_stream *stream)
+static int cs47l15_open(struct snd_soc_component *component,
+                       struct snd_compr_stream *stream)
 {
        struct snd_soc_pcm_runtime *rtd = stream->private_data;
-       struct snd_soc_component *component =
-               snd_soc_rtdcom_lookup(rtd, DRV_NAME);
        struct cs47l15 *cs47l15 = snd_soc_component_get_drvdata(component);
        struct madera_priv *priv = &cs47l15->core;
        struct madera *madera = priv->madera;
@@ -1329,7 +1328,7 @@ static unsigned int cs47l15_digital_vu[] = {
        MADERA_DAC_DIGITAL_VOLUME_5R,
 };
 
-static const struct snd_compr_ops cs47l15_compr_ops = {
+static const struct snd_compress_ops cs47l15_compress_ops = {
        .open = &cs47l15_open,
        .free = &wm_adsp_compr_free,
        .set_params = &wm_adsp_compr_set_params,
@@ -1345,7 +1344,7 @@ static const struct snd_soc_component_driver soc_component_dev_cs47l15 = {
        .set_sysclk             = &madera_set_sysclk,
        .set_pll                = &cs47l15_set_fll,
        .name                   = DRV_NAME,
-       .compr_ops              = &cs47l15_compr_ops,
+       .compress_ops           = &cs47l15_compress_ops,
        .controls               = cs47l15_snd_controls,
        .num_controls           = ARRAY_SIZE(cs47l15_snd_controls),
        .dapm_widgets           = cs47l15_dapm_widgets,

diff --git a/sound/soc/codecs/cs47l24.c b/sound/soc/codecs/cs47l24.c
index 6b0570f..f6d173d 100644 (file)
--- a/sound/soc/codecs/cs47l24.c
+++ b/sound/soc/codecs/cs47l24.c
@@ -1068,10 +1068,10 @@ static struct snd_soc_dai_driver cs47l24_dai[] = {
        },
 };
 
-static int cs47l24_open(struct snd_compr_stream *stream)
+static int cs47l24_open(struct snd_soc_component *component,
+                       struct snd_compr_stream *stream)
 {
        struct snd_soc_pcm_runtime *rtd = stream->private_data;
-       struct snd_soc_component *component = snd_soc_rtdcom_lookup(rtd, DRV_NAME);
        struct cs47l24_priv *priv = snd_soc_component_get_drvdata(component);
        struct arizona *arizona = priv->core.arizona;
        int n_adsp;
@@ -1178,7 +1178,7 @@ static unsigned int cs47l24_digital_vu[] = {
        ARIZONA_DAC_DIGITAL_VOLUME_4L,
 };
 
-static struct snd_compr_ops cs47l24_compr_ops = {
+static struct snd_compress_ops cs47l24_compress_ops = {
        .open           = cs47l24_open,
        .free           = wm_adsp_compr_free,
        .set_params     = wm_adsp_compr_set_params,
@@ -1194,7 +1194,7 @@ static const struct snd_soc_component_driver soc_component_dev_cs47l24 = {
        .set_sysclk             = arizona_set_sysclk,
        .set_pll                = cs47l24_set_fll,
        .name                   = DRV_NAME,
-       .compr_ops              = &cs47l24_compr_ops,
+       .compress_ops           = &cs47l24_compress_ops,
        .controls               = cs47l24_snd_controls,
        .num_controls           = ARRAY_SIZE(cs47l24_snd_controls),
        .dapm_widgets           = cs47l24_dapm_widgets,

diff --git a/sound/soc/codecs/cs47l35.c b/sound/soc/codecs/cs47l35.c
index 1883980..d7538d5 100644 (file)
--- a/sound/soc/codecs/cs47l35.c
+++ b/sound/soc/codecs/cs47l35.c
@@ -1504,11 +1504,10 @@ static struct snd_soc_dai_driver cs47l35_dai[] = {
        },
 };
 
-static int cs47l35_open(struct snd_compr_stream *stream)
+static int cs47l35_open(struct snd_soc_component *component,
+                       struct snd_compr_stream *stream)
 {
        struct snd_soc_pcm_runtime *rtd = stream->private_data;
-       struct snd_soc_component *component =
-               snd_soc_rtdcom_lookup(rtd, DRV_NAME);
        struct cs47l35 *cs47l35 = snd_soc_component_get_drvdata(component);
        struct madera_priv *priv = &cs47l35->core;
        struct madera *madera = priv->madera;
@@ -1622,7 +1621,7 @@ static unsigned int cs47l35_digital_vu[] = {
        MADERA_DAC_DIGITAL_VOLUME_5R,
 };
 
-static const struct snd_compr_ops cs47l35_compr_ops = {
+static const struct snd_compress_ops cs47l35_compress_ops = {
        .open = &cs47l35_open,
        .free = &wm_adsp_compr_free,
        .set_params = &wm_adsp_compr_set_params,
@@ -1638,7 +1637,7 @@ static const struct snd_soc_component_driver soc_component_dev_cs47l35 = {
        .set_sysclk             = &madera_set_sysclk,
        .set_pll                = &cs47l35_set_fll,
        .name                   = DRV_NAME,
-       .compr_ops              = &cs47l35_compr_ops,
+       .compress_ops           = &cs47l35_compress_ops,
        .controls               = cs47l35_snd_controls,
        .num_controls           = ARRAY_SIZE(cs47l35_snd_controls),
        .dapm_widgets           = cs47l35_dapm_widgets,

diff --git a/sound/soc/codecs/cs47l85.c b/sound/soc/codecs/cs47l85.c
index a575113..9de991a 100644 (file)
--- a/sound/soc/codecs/cs47l85.c
+++ b/sound/soc/codecs/cs47l85.c
@@ -2447,11 +2447,10 @@ static struct snd_soc_dai_driver cs47l85_dai[] = {
        },
 };
 
-static int cs47l85_open(struct snd_compr_stream *stream)
+static int cs47l85_open(struct snd_soc_component *component,
+                       struct snd_compr_stream *stream)
 {
        struct snd_soc_pcm_runtime *rtd = stream->private_data;
-       struct snd_soc_component *component =
-               snd_soc_rtdcom_lookup(rtd, DRV_NAME);
        struct cs47l85 *cs47l85 = snd_soc_component_get_drvdata(component);
        struct madera_priv *priv = &cs47l85->core;
        struct madera *madera = priv->madera;
@@ -2566,7 +2565,7 @@ static const unsigned int cs47l85_digital_vu[] = {
        MADERA_DAC_DIGITAL_VOLUME_6R,
 };
 
-static const struct snd_compr_ops cs47l85_compr_ops = {
+static const struct snd_compress_ops cs47l85_compress_ops = {
        .open = &cs47l85_open,
        .free = &wm_adsp_compr_free,
        .set_params = &wm_adsp_compr_set_params,
@@ -2582,7 +2581,7 @@ static const struct snd_soc_component_driver soc_component_dev_cs47l85 = {
        .set_sysclk             = &madera_set_sysclk,
        .set_pll                = &cs47l85_set_fll,
        .name                   = DRV_NAME,
-       .compr_ops              = &cs47l85_compr_ops,
+       .compress_ops           = &cs47l85_compress_ops,
        .controls               = cs47l85_snd_controls,
        .num_controls           = ARRAY_SIZE(cs47l85_snd_controls),
        .dapm_widgets           = cs47l85_dapm_widgets,

diff --git a/sound/soc/codecs/cs47l90.c b/sound/soc/codecs/cs47l90.c
index 81a1311..2715b5d 100644 (file)
--- a/sound/soc/codecs/cs47l90.c
+++ b/sound/soc/codecs/cs47l90.c
@@ -2358,11 +2358,10 @@ static struct snd_soc_dai_driver cs47l90_dai[] = {
        },
 };
 
-static int cs47l90_open(struct snd_compr_stream *stream)
+static int cs47l90_open(struct snd_soc_component *component,
+                       struct snd_compr_stream *stream)
 {
        struct snd_soc_pcm_runtime *rtd = stream->private_data;
-       struct snd_soc_component *component =
-               snd_soc_rtdcom_lookup(rtd, DRV_NAME);
        struct cs47l90 *cs47l90 = snd_soc_component_get_drvdata(component);
        struct madera_priv *priv = &cs47l90->core;
        struct madera *madera = priv->madera;
@@ -2473,7 +2472,7 @@ static unsigned int cs47l90_digital_vu[] = {
        MADERA_DAC_DIGITAL_VOLUME_5R,
 };
 
-static const struct snd_compr_ops cs47l90_compr_ops = {
+static const struct snd_compress_ops cs47l90_compress_ops = {
        .open = &cs47l90_open,
        .free = &wm_adsp_compr_free,
        .set_params = &wm_adsp_compr_set_params,
@@ -2489,7 +2488,7 @@ static const struct snd_soc_component_driver soc_component_dev_cs47l90 = {
        .set_sysclk             = &madera_set_sysclk,
        .set_pll                = &cs47l90_set_fll,
        .name                   = DRV_NAME,
-       .compr_ops              = &cs47l90_compr_ops,
+       .compress_ops           = &cs47l90_compress_ops,
        .controls               = cs47l90_snd_controls,
        .num_controls           = ARRAY_SIZE(cs47l90_snd_controls),
        .dapm_widgets           = cs47l90_dapm_widgets,

diff --git a/sound/soc/codecs/cs47l92.c b/sound/soc/codecs/cs47l92.c
index 15fc213..108d280 100644 (file)
--- a/sound/soc/codecs/cs47l92.c
+++ b/sound/soc/codecs/cs47l92.c
@@ -1830,11 +1830,10 @@ static struct snd_soc_dai_driver cs47l92_dai[] = {
        },
 };
 
-static int cs47l92_open(struct snd_compr_stream *stream)
+static int cs47l92_open(struct snd_soc_component *component,
+                       struct snd_compr_stream *stream)
 {
        struct snd_soc_pcm_runtime *rtd = stream->private_data;
-       struct snd_soc_component *component =
-               snd_soc_rtdcom_lookup(rtd, DRV_NAME);
        struct cs47l92 *cs47l92 = snd_soc_component_get_drvdata(component);
        struct madera_priv *priv = &cs47l92->core;
        struct madera *madera = priv->madera;
@@ -1933,7 +1932,7 @@ static unsigned int cs47l92_digital_vu[] = {
        MADERA_DAC_DIGITAL_VOLUME_5R,
 };
 
-static const struct snd_compr_ops cs47l92_compr_ops = {
+static const struct snd_compress_ops cs47l92_compress_ops = {
        .open = &cs47l92_open,
        .free = &wm_adsp_compr_free,
        .set_params = &wm_adsp_compr_set_params,
@@ -1949,7 +1948,7 @@ static const struct snd_soc_component_driver soc_component_dev_cs47l92 = {
        .set_sysclk             = &madera_set_sysclk,
        .set_pll                = &cs47l92_set_fll,
        .name                   = DRV_NAME,
-       .compr_ops              = &cs47l92_compr_ops,
+       .compress_ops           = &cs47l92_compress_ops,
        .controls               = cs47l92_snd_controls,
        .num_controls           = ARRAY_SIZE(cs47l92_snd_controls),
        .dapm_widgets           = cs47l92_dapm_widgets,

diff --git a/sound/soc/codecs/wm5102.c b/sound/soc/codecs/wm5102.c
index d6d4b41..2ed3fa6 100644 (file)
--- a/sound/soc/codecs/wm5102.c
+++ b/sound/soc/codecs/wm5102.c
@@ -1909,10 +1909,9 @@ static struct snd_soc_dai_driver wm5102_dai[] = {
        },
 };
 
-static int wm5102_open(struct snd_compr_stream *stream)
+static int wm5102_open(struct snd_soc_component *component,
+                      struct snd_compr_stream *stream)
 {
-       struct snd_soc_pcm_runtime *rtd = stream->private_data;
-       struct snd_soc_component *component = snd_soc_rtdcom_lookup(rtd, DRV_NAME);
        struct wm5102_priv *priv = snd_soc_component_get_drvdata(component);
 
        return wm_adsp_compr_open(&priv->core.adsp[0], stream);
@@ -1992,7 +1991,7 @@ static unsigned int wm5102_digital_vu[] = {
        ARIZONA_DAC_DIGITAL_VOLUME_5R,
 };
 
-static struct snd_compr_ops wm5102_compr_ops = {
+static struct snd_compress_ops wm5102_compress_ops = {
        .open           = wm5102_open,
        .free           = wm_adsp_compr_free,
        .set_params     = wm_adsp_compr_set_params,
@@ -2008,7 +2007,7 @@ static const struct snd_soc_component_driver soc_component_dev_wm5102 = {
        .set_sysclk             = arizona_set_sysclk,
        .set_pll                = wm5102_set_fll,
        .name                   = DRV_NAME,
-       .compr_ops              = &wm5102_compr_ops,
+       .compress_ops           = &wm5102_compress_ops,
        .controls               = wm5102_snd_controls,
        .num_controls           = ARRAY_SIZE(wm5102_snd_controls),
        .dapm_widgets           = wm5102_dapm_widgets,

diff --git a/sound/soc/codecs/wm5110.c b/sound/soc/codecs/wm5110.c
index 499e87d..44de44b 100644 (file)
--- a/sound/soc/codecs/wm5110.c
+++ b/sound/soc/codecs/wm5110.c
@@ -2237,10 +2237,10 @@ static struct snd_soc_dai_driver wm5110_dai[] = {
        },
 };
 
-static int wm5110_open(struct snd_compr_stream *stream)
+static int wm5110_open(struct snd_soc_component *component,
+                      struct snd_compr_stream *stream)
 {
        struct snd_soc_pcm_runtime *rtd = stream->private_data;
-       struct snd_soc_component *component = snd_soc_rtdcom_lookup(rtd, DRV_NAME);
        struct wm5110_priv *priv = snd_soc_component_get_drvdata(component);
        struct arizona *arizona = priv->core.arizona;
        int n_adsp;
@@ -2355,7 +2355,7 @@ static unsigned int wm5110_digital_vu[] = {
        ARIZONA_DAC_DIGITAL_VOLUME_6R,
 };
 
-static struct snd_compr_ops wm5110_compr_ops = {
+static struct snd_compress_ops wm5110_compress_ops = {
        .open           = wm5110_open,
        .free           = wm_adsp_compr_free,
        .set_params     = wm_adsp_compr_set_params,
@@ -2371,7 +2371,7 @@ static const struct snd_soc_component_driver soc_component_dev_wm5110 = {
        .set_sysclk             = arizona_set_sysclk,
        .set_pll                = wm5110_set_fll,
        .name                   = DRV_NAME,
-       .compr_ops              = &wm5110_compr_ops,
+       .compress_ops           = &wm5110_compress_ops,
        .controls               = wm5110_snd_controls,
        .num_controls           = ARRAY_SIZE(wm5110_snd_controls),
        .dapm_widgets           = wm5110_dapm_widgets,

diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c
index 1ef6940..519ca2e 100644 (file)
--- a/sound/soc/codecs/wm_adsp.c
+++ b/sound/soc/codecs/wm_adsp.c
@@ -3509,7 +3509,8 @@ out:
 }
 EXPORT_SYMBOL_GPL(wm_adsp_compr_open);
 
-int wm_adsp_compr_free(struct snd_compr_stream *stream)
+int wm_adsp_compr_free(struct snd_soc_component *component,
+                      struct snd_compr_stream *stream)
 {
        struct wm_adsp_compr *compr = stream->runtime->private_data;
        struct wm_adsp *dsp = compr->dsp;
@@ -3583,7 +3584,8 @@ static inline unsigned int wm_adsp_compr_frag_words(struct wm_adsp_compr *compr)
        return compr->size.fragment_size / WM_ADSP_DATA_WORD_SIZE;
 }
 
-int wm_adsp_compr_set_params(struct snd_compr_stream *stream,
+int wm_adsp_compr_set_params(struct snd_soc_component *component,
+                            struct snd_compr_stream *stream,
                             struct snd_compr_params *params)
 {
        struct wm_adsp_compr *compr = stream->runtime->private_data;
@@ -3610,7 +3612,8 @@ int wm_adsp_compr_set_params(struct snd_compr_stream *stream,
 }
 EXPORT_SYMBOL_GPL(wm_adsp_compr_set_params);
 
-int wm_adsp_compr_get_caps(struct snd_compr_stream *stream,
+int wm_adsp_compr_get_caps(struct snd_soc_component *component,
+                          struct snd_compr_stream *stream,
                           struct snd_compr_caps *caps)
 {
        struct wm_adsp_compr *compr = stream->runtime->private_data;
@@ -3976,7 +3979,8 @@ static int wm_adsp_buffer_get_error(struct wm_adsp_compr_buf *buf)
        return 0;
 }
 
-int wm_adsp_compr_trigger(struct snd_compr_stream *stream, int cmd)
+int wm_adsp_compr_trigger(struct snd_soc_component *component,
+                         struct snd_compr_stream *stream, int cmd)
 {
        struct wm_adsp_compr *compr = stream->runtime->private_data;
        struct wm_adsp *dsp = compr->dsp;
@@ -4139,7 +4143,8 @@ static int wm_adsp_buffer_reenable_irq(struct wm_adsp_compr_buf *buf)
                                    buf->irq_count);
 }
 
-int wm_adsp_compr_pointer(struct snd_compr_stream *stream,
+int wm_adsp_compr_pointer(struct snd_soc_component *component,
+                         struct snd_compr_stream *stream,
                          struct snd_compr_tstamp *tstamp)
 {
        struct wm_adsp_compr *compr = stream->runtime->private_data;
@@ -4297,7 +4302,8 @@ static int wm_adsp_compr_read(struct wm_adsp_compr *compr,
        return ntotal;
 }
 
-int wm_adsp_compr_copy(struct snd_compr_stream *stream, char __user *buf,
+int wm_adsp_compr_copy(struct snd_soc_component *component,
+                      struct snd_compr_stream *stream, char __user *buf,
                       size_t count)
 {
        struct wm_adsp_compr *compr = stream->runtime->private_data;

diff --git a/sound/soc/codecs/wm_adsp.h b/sound/soc/codecs/wm_adsp.h
index 4c481cf..1996350 100644 (file)
--- a/sound/soc/codecs/wm_adsp.h
+++ b/sound/soc/codecs/wm_adsp.h
@@ -190,16 +190,22 @@ int wm_adsp_fw_put(struct snd_kcontrol *kcontrol,
                   struct snd_ctl_elem_value *ucontrol);
 
 int wm_adsp_compr_open(struct wm_adsp *dsp, struct snd_compr_stream *stream);
-int wm_adsp_compr_free(struct snd_compr_stream *stream);
-int wm_adsp_compr_set_params(struct snd_compr_stream *stream,
+int wm_adsp_compr_free(struct snd_soc_component *component,
+                      struct snd_compr_stream *stream);
+int wm_adsp_compr_set_params(struct snd_soc_component *component,
+                            struct snd_compr_stream *stream,
                             struct snd_compr_params *params);
-int wm_adsp_compr_get_caps(struct snd_compr_stream *stream,
+int wm_adsp_compr_get_caps(struct snd_soc_component *component,
+                          struct snd_compr_stream *stream,
                           struct snd_compr_caps *caps);
-int wm_adsp_compr_trigger(struct snd_compr_stream *stream, int cmd);
+int wm_adsp_compr_trigger(struct snd_soc_component *component,
+                         struct snd_compr_stream *stream, int cmd);
 int wm_adsp_compr_handle_irq(struct wm_adsp *dsp);
-int wm_adsp_compr_pointer(struct snd_compr_stream *stream,
+int wm_adsp_compr_pointer(struct snd_soc_component *component,
+                         struct snd_compr_stream *stream,
                          struct snd_compr_tstamp *tstamp);
-int wm_adsp_compr_copy(struct snd_compr_stream *stream,
+int wm_adsp_compr_copy(struct snd_soc_component *component,
+                      struct snd_compr_stream *stream,
                       char __user *buf, size_t count);
 int wm_adsp_write_ctl(struct wm_adsp *dsp, const char *name,  int type,
                      unsigned int alg, void *buf, size_t len);