ASoC: make ops a pointer in 'struct snd_soc_dai'

Considering the fact that most cpu_dai or codec_dai are using a same
'snd_soc_dai_ops' for several similar interfaces, 'ops' would be better
made a pointer instead, to make sharing easier and code a bit cleaner.

The patch below is rather preliminary since the asoc tree is being
actively developed, and this touches almost every piece of code,
(and possibly many others in development need to be changed as
well). Building of all codecs are OK, yet to every SoC, I didn't test
that.

Signed-off-by: Eric Miao <eric.miao@marvell.com>
Acked-by: Timur Tabi <timur@freescale.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

1 files changed, 12 insertions, 21 deletions

diff --git a/sound/soc/atmel/atmel_ssc_dai.c b/sound/soc/atmel/atmel_ssc_dai.c
index ff0054b76502..e588e63f18d2 100644
--- a/sound/soc/atmel/atmel_ssc_dai.c
+++ b/sound/soc/atmel/atmel_ssc_dai.c
@@ -697,6 +697,15 @@ static int atmel_ssc_resume(struct snd_soc_dai *cpu_dai)
 #define ATMEL_SSC_FORMATS (SNDRV_PCM_FMTBIT_S8     | SNDRV_PCM_FMTBIT_S16_LE |\
                           SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE)
 
+static struct snd_soc_dai_ops atmel_ssc_dai_ops = {
+        .startup        = atmel_ssc_startup,
+        .shutdown       = atmel_ssc_shutdown,
+        .prepare        = atmel_ssc_prepare,
+        .hw_params      = atmel_ssc_hw_params,
+        .set_fmt        = atmel_ssc_set_dai_fmt,
+        .set_clkdiv     = atmel_ssc_set_dai_clkdiv,
+};
+
 struct snd_soc_dai atmel_ssc_dai[NUM_SSC_DEVICES] = {
         {       .name = "atmel-ssc0",
                 .id = 0,
@@ -712,13 +721,7 @@ struct snd_soc_dai atmel_ssc_dai[NUM_SSC_DEVICES] = {
                         .channels_max = 2,
                         .rates = ATMEL_SSC_RATES,
                         .formats = ATMEL_SSC_FORMATS,},
-                .ops = {
-                        .startup = atmel_ssc_startup,
-                        .shutdown = atmel_ssc_shutdown,
-                        .prepare = atmel_ssc_prepare,
-                        .hw_params = atmel_ssc_hw_params,
-                        .set_fmt = atmel_ssc_set_dai_fmt,
-                        .set_clkdiv = atmel_ssc_set_dai_clkdiv,},
+                .ops = &atmel_ssc_dai_ops,
                 .private_data = &ssc_info[0],
         },
 #if NUM_SSC_DEVICES == 3
@@ -736,13 +739,7 @@ struct snd_soc_dai atmel_ssc_dai[NUM_SSC_DEVICES] = {
                         .channels_max = 2,
                         .rates = ATMEL_SSC_RATES,
                         .formats = ATMEL_SSC_FORMATS,},
-                .ops = {
-                        .startup = atmel_ssc_startup,
-                        .shutdown = atmel_ssc_shutdown,
-                        .prepare = atmel_ssc_prepare,
-                        .hw_params = atmel_ssc_hw_params,
-                        .set_fmt = atmel_ssc_set_dai_fmt,
-                        .set_clkdiv = atmel_ssc_set_dai_clkdiv,},
+                .ops = &atmel_ssc_dai_ops,
                 .private_data = &ssc_info[1],
         },
         {       .name = "atmel-ssc2",
@@ -759,13 +756,7 @@ struct snd_soc_dai atmel_ssc_dai[NUM_SSC_DEVICES] = {
                         .channels_max = 2,
                         .rates = ATMEL_SSC_RATES,
                         .formats = ATMEL_SSC_FORMATS,},
-                .ops = {
-                        .startup = atmel_ssc_startup,
-                        .shutdown = atmel_ssc_shutdown,
-                        .prepare = atmel_ssc_prepare,
-                        .hw_params = atmel_ssc_hw_params,
-                        .set_fmt = atmel_ssc_set_dai_fmt,
-                        .set_clkdiv = atmel_ssc_set_dai_clkdiv,},
+                .ops = &atmel_ssc_dai_ops,
                 .private_data = &ssc_info[2],
         },
 #endif