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, 11 insertions, 9 deletions

diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c
index 05dd5abcddf4..d6882be33452 100644
--- a/sound/soc/omap/omap-mcbsp.c
+++ b/sound/soc/omap/omap-mcbsp.c
@@ -461,6 +461,16 @@ static int omap_mcbsp_dai_set_dai_sysclk(struct snd_soc_dai *cpu_dai,
         return err;
 }
 
+static struct snd_soc_dai_ops omap_mcbsp_dai_ops = {
+        .startup        = omap_mcbsp_dai_startup,
+        .shutdown       = omap_mcbsp_dai_shutdown,
+        .trigger        = omap_mcbsp_dai_trigger,
+        .hw_params      = omap_mcbsp_dai_hw_params,
+        .set_fmt        = omap_mcbsp_dai_set_dai_fmt,
+        .set_clkdiv     = omap_mcbsp_dai_set_clkdiv,
+        .set_sysclk     = omap_mcbsp_dai_set_dai_sysclk,
+};
+
 #define OMAP_MCBSP_DAI_BUILDER(link_id)                         \
 {                                                               \
         .name = "omap-mcbsp-dai-"#link_id,                      \
@@ -477,15 +487,7 @@ static int omap_mcbsp_dai_set_dai_sysclk(struct snd_soc_dai *cpu_dai,
                 .rates = OMAP_MCBSP_RATES,                      \
                 .formats = SNDRV_PCM_FMTBIT_S16_LE,             \
         },                                                      \
-        .ops = {                                                \
-                .startup = omap_mcbsp_dai_startup,              \
-                .shutdown = omap_mcbsp_dai_shutdown,            \
-                .trigger = omap_mcbsp_dai_trigger,              \
-                .hw_params = omap_mcbsp_dai_hw_params,          \
-                .set_fmt = omap_mcbsp_dai_set_dai_fmt,          \
-                .set_clkdiv = omap_mcbsp_dai_set_clkdiv,        \
-                .set_sysclk = omap_mcbsp_dai_set_dai_sysclk,    \
-        },                                                      \
+        .ops = &omap_mcbsp_dai_ops,                             \
         .private_data = &mcbsp_data[(link_id)].bus_id,          \
 }