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>

2 files changed, 21 insertions, 17 deletions

diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c
index 6844009833db..0fddd437a7c9 100644
--- a/sound/soc/fsl/fsl_ssi.c
+++ b/sound/soc/fsl/fsl_ssi.c
@@ -562,6 +562,15 @@ static int fsl_ssi_set_fmt(struct snd_soc_dai *cpu_dai, unsigned int format)
 /**
  * fsl_ssi_dai_template: template CPU DAI for the SSI
  */
+static struct snd_soc_dai_ops fsl_ssi_dai_ops = {
+        .startup        = fsl_ssi_startup,
+        .hw_params      = fsl_ssi_hw_params,
+        .shutdown       = fsl_ssi_shutdown,
+        .trigger        = fsl_ssi_trigger,
+        .set_sysclk     = fsl_ssi_set_sysclk,
+        .set_fmt        = fsl_ssi_set_fmt,
+};
+
 static struct snd_soc_dai fsl_ssi_dai_template = {
         .playback = {
                 /* The SSI does not support monaural audio. */
@@ -576,14 +585,7 @@ static struct snd_soc_dai fsl_ssi_dai_template = {
                 .rates = FSLSSI_I2S_RATES,
                 .formats = FSLSSI_I2S_FORMATS,
         },
-        .ops = {
-                .startup = fsl_ssi_startup,
-                .hw_params = fsl_ssi_hw_params,
-                .shutdown = fsl_ssi_shutdown,
-                .trigger = fsl_ssi_trigger,
-                .set_sysclk = fsl_ssi_set_sysclk,
-                .set_fmt = fsl_ssi_set_fmt,
-        },
+        .ops = &fsl_ssi_dai_ops,
 };
 
 /**
diff --git a/sound/soc/fsl/mpc5200_psc_i2s.c b/sound/soc/fsl/mpc5200_psc_i2s.c
index 9eb1ce185bd0..3aa729df27b5 100644
--- a/sound/soc/fsl/mpc5200_psc_i2s.c
+++ b/sound/soc/fsl/mpc5200_psc_i2s.c
@@ -468,6 +468,16 @@ static int psc_i2s_set_fmt(struct snd_soc_dai *cpu_dai, unsigned int format)
 /**
  * psc_i2s_dai_template: template CPU Digital Audio Interface
  */
+static struct snd_soc_dai_ops psc_i2s_dai_ops = {
+        .startup        = psc_i2s_startup,
+        .hw_params      = psc_i2s_hw_params,
+        .hw_free        = psc_i2s_hw_free,
+        .shutdown       = psc_i2s_shutdown,
+        .trigger        = psc_i2s_trigger,
+        .set_sysclk     = psc_i2s_set_sysclk,
+        .set_fmt        = psc_i2s_set_fmt,
+};
+
 static struct snd_soc_dai psc_i2s_dai_template = {
         .playback = {
                 .channels_min = 2,
@@ -481,15 +491,7 @@ static struct snd_soc_dai psc_i2s_dai_template = {
                 .rates = PSC_I2S_RATES,
                 .formats = PSC_I2S_FORMATS,
         },
-        .ops = {
-                .startup = psc_i2s_startup,
-                .hw_params = psc_i2s_hw_params,
-                .hw_free = psc_i2s_hw_free,
-                .shutdown = psc_i2s_shutdown,
-                .trigger = psc_i2s_trigger,
-                .set_sysclk = psc_i2s_set_sysclk,
-                .set_fmt = psc_i2s_set_fmt,
-        },
+        .ops = &psc_i2s_dai_ops,
 };
 
 /* ---------------------------------------------------------------------