ASoC: codecs/cs47lxx: merge DAI call back functions into ops

ALSA SoC merges DAI call backs into .ops.
This patch merge these into one.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/87h6p99m55.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 a6538da..1245e1a 100644 (file)
--- a/sound/soc/codecs/cs47l15.c
+++ b/sound/soc/codecs/cs47l15.c
@@ -1143,6 +1143,10 @@ static int cs47l15_set_fll(struct snd_soc_component *component, int fll_id,
        }
 }
 
+static const struct snd_soc_dai_ops cs47l15_dai_ops = {
+       .compress_new = snd_soc_new_compress,
+};
+
 static struct snd_soc_dai_driver cs47l15_dai[] = {
        {
                .name = "cs47l15-aif1",
@@ -1219,7 +1223,7 @@ static struct snd_soc_dai_driver cs47l15_dai[] = {
                        .rates = MADERA_RATES,
                        .formats = MADERA_FORMATS,
                },
-               .compress_new = snd_soc_new_compress,
+               .ops = &cs47l15_dai_ops,
        },
        {
                .name = "cs47l15-dsp-trace",

diff --git a/sound/soc/codecs/cs47l24.c b/sound/soc/codecs/cs47l24.c
index a07b621..cfa1d34 100644 (file)
--- a/sound/soc/codecs/cs47l24.c
+++ b/sound/soc/codecs/cs47l24.c
@@ -957,6 +957,10 @@ static int cs47l24_set_fll(struct snd_soc_component *component, int fll_id,
 #define CS47L24_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |\
                         SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE)
 
+static const struct snd_soc_dai_ops cs47l24_dai_ops = {
+       .compress_new = snd_soc_new_compress,
+};
+
 static struct snd_soc_dai_driver cs47l24_dai[] = {
        {
                .name = "cs47l24-aif1",
@@ -1033,7 +1037,7 @@ static struct snd_soc_dai_driver cs47l24_dai[] = {
                        .rates = CS47L24_RATES,
                        .formats = CS47L24_FORMATS,
                },
-               .compress_new = snd_soc_new_compress,
+               .ops = &cs47l24_dai_ops,
        },
        {
                .name = "cs47l24-dsp-voicectrl",
@@ -1054,7 +1058,7 @@ static struct snd_soc_dai_driver cs47l24_dai[] = {
                        .rates = CS47L24_RATES,
                        .formats = CS47L24_FORMATS,
                },
-               .compress_new = snd_soc_new_compress,
+               .ops = &cs47l24_dai_ops,
        },
        {
                .name = "cs47l24-dsp-trace",

diff --git a/sound/soc/codecs/cs47l35.c b/sound/soc/codecs/cs47l35.c
index c05c80c..a953f2e 100644 (file)
--- a/sound/soc/codecs/cs47l35.c
+++ b/sound/soc/codecs/cs47l35.c
@@ -1348,6 +1348,10 @@ static int cs47l35_set_fll(struct snd_soc_component *component, int fll_id,
        }
 }
 
+static const struct snd_soc_dai_ops cs47l35_dai_ops = {
+       .compress_new = snd_soc_new_compress,
+};
+
 static struct snd_soc_dai_driver cs47l35_dai[] = {
        {
                .name = "cs47l35-aif1",
@@ -1462,7 +1466,7 @@ static struct snd_soc_dai_driver cs47l35_dai[] = {
                        .rates = MADERA_RATES,
                        .formats = MADERA_FORMATS,
                },
-               .compress_new = &snd_soc_new_compress,
+               .ops = &cs47l35_dai_ops,
        },
        {
                .name = "cs47l35-dsp-voicectrl",
@@ -1483,7 +1487,7 @@ static struct snd_soc_dai_driver cs47l35_dai[] = {
                        .rates = MADERA_RATES,
                        .formats = MADERA_FORMATS,
                },
-               .compress_new = &snd_soc_new_compress,
+               .ops = &cs47l35_dai_ops,
        },
        {
                .name = "cs47l35-dsp-trace",

diff --git a/sound/soc/codecs/cs47l85.c b/sound/soc/codecs/cs47l85.c
index dd7997a..8276854 100644 (file)
--- a/sound/soc/codecs/cs47l85.c
+++ b/sound/soc/codecs/cs47l85.c
@@ -2249,6 +2249,10 @@ static int cs47l85_set_fll(struct snd_soc_component *component, int fll_id,
        }
 }
 
+static const struct snd_soc_dai_ops cs47l85_dai_ops = {
+       .compress_new = snd_soc_new_compress,
+};
+
 static struct snd_soc_dai_driver cs47l85_dai[] = {
        {
                .name = "cs47l85-aif1",
@@ -2404,7 +2408,7 @@ static struct snd_soc_dai_driver cs47l85_dai[] = {
                        .rates = MADERA_RATES,
                        .formats = MADERA_FORMATS,
                },
-               .compress_new = &snd_soc_new_compress,
+               .ops = &cs47l85_dai_ops,
        },
        {
                .name = "cs47l85-dsp-voicectrl",
@@ -2425,7 +2429,7 @@ static struct snd_soc_dai_driver cs47l85_dai[] = {
                        .rates = MADERA_RATES,
                        .formats = MADERA_FORMATS,
                },
-               .compress_new = &snd_soc_new_compress,
+               .ops = &cs47l85_dai_ops,
        },
        {
                .name = "cs47l85-dsp-trace",

diff --git a/sound/soc/codecs/cs47l90.c b/sound/soc/codecs/cs47l90.c
index cdd5e7e..2c9a537 100644 (file)
--- a/sound/soc/codecs/cs47l90.c
+++ b/sound/soc/codecs/cs47l90.c
@@ -2168,6 +2168,10 @@ static int cs47l90_set_fll(struct snd_soc_component *component, int fll_id,
        }
 }
 
+static const struct snd_soc_dai_ops cs47l90_dai_ops = {
+       .compress_new = snd_soc_new_compress,
+};
+
 static struct snd_soc_dai_driver cs47l90_dai[] = {
        {
                .name = "cs47l90-aif1",
@@ -2323,7 +2327,7 @@ static struct snd_soc_dai_driver cs47l90_dai[] = {
                        .rates = MADERA_RATES,
                        .formats = MADERA_FORMATS,
                },
-               .compress_new = &snd_soc_new_compress,
+               .ops = &cs47l90_dai_ops,
        },
        {
                .name = "cs47l90-dsp-voicectrl",
@@ -2344,7 +2348,7 @@ static struct snd_soc_dai_driver cs47l90_dai[] = {
                        .rates = MADERA_RATES,
                        .formats = MADERA_FORMATS,
                },
-               .compress_new = &snd_soc_new_compress,
+               .ops = &cs47l90_dai_ops,
        },
        {
                .name = "cs47l90-dsp-trace",

diff --git a/sound/soc/codecs/cs47l92.c b/sound/soc/codecs/cs47l92.c
index bc4d311..352deea 100644 (file)
--- a/sound/soc/codecs/cs47l92.c
+++ b/sound/soc/codecs/cs47l92.c
@@ -1690,6 +1690,10 @@ static int cs47l92_set_fll(struct snd_soc_component *component, int fll_id,
        }
 }
 
+static const struct snd_soc_dai_ops cs47l92_dai_ops = {
+       .compress_new = snd_soc_new_compress,
+};
+
 static struct snd_soc_dai_driver cs47l92_dai[] = {
        {
                .name = "cs47l92-aif1",
@@ -1823,7 +1827,7 @@ static struct snd_soc_dai_driver cs47l92_dai[] = {
                        .rates = MADERA_RATES,
                        .formats = MADERA_FORMATS,
                },
-               .compress_new = snd_soc_new_compress,
+               .ops = &cs47l92_dai_ops,
        },
        {
                .name = "cs47l92-dsp-trace",