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>

3 files changed, 34 insertions, 62 deletions

diff --git a/sound/soc/pxa/pxa-ssp.c b/sound/soc/pxa/pxa-ssp.c
index 4a973ab710be..3e18064e86b2 100644
--- a/sound/soc/pxa/pxa-ssp.c
+++ b/sound/soc/pxa/pxa-ssp.c
@@ -784,6 +784,19 @@ static void pxa_ssp_remove(struct platform_device *pdev,
                             SNDRV_PCM_FMTBIT_S24_LE |   \
                             SNDRV_PCM_FMTBIT_S32_LE)
 
+static struct snd_soc_dai_ops pxa_ssp_dai_ops = {
+        .startup        = pxa_ssp_startup,
+        .shutdown       = pxa_ssp_shutdown,
+        .trigger        = pxa_ssp_trigger,
+        .hw_params      = pxa_ssp_hw_params,
+        .set_sysclk     = pxa_ssp_set_dai_sysclk,
+        .set_clkdiv     = pxa_ssp_set_dai_clkdiv,
+        .set_pll        = pxa_ssp_set_dai_pll,
+        .set_fmt        = pxa_ssp_set_dai_fmt,
+        .set_tdm_slot   = pxa_ssp_set_dai_tdm_slot,
+        .set_tristate   = pxa_ssp_set_dai_tristate,
+};
+
 struct snd_soc_dai pxa_ssp_dai[] = {
         {
                 .name = "pxa2xx-ssp1",
@@ -804,18 +817,7 @@ struct snd_soc_dai pxa_ssp_dai[] = {
                         .rates = PXA_SSP_RATES,
                         .formats = PXA_SSP_FORMATS,
                  },
-                .ops = {
-                        .startup = pxa_ssp_startup,
-                        .shutdown = pxa_ssp_shutdown,
-                        .trigger = pxa_ssp_trigger,
-                        .hw_params = pxa_ssp_hw_params,
-                        .set_sysclk = pxa_ssp_set_dai_sysclk,
-                        .set_clkdiv = pxa_ssp_set_dai_clkdiv,
-                        .set_pll = pxa_ssp_set_dai_pll,
-                        .set_fmt = pxa_ssp_set_dai_fmt,
-                        .set_tdm_slot = pxa_ssp_set_dai_tdm_slot,
-                        .set_tristate = pxa_ssp_set_dai_tristate,
-                },
+                .ops = &pxa_ssp_dai_ops,
         },
         {       .name = "pxa2xx-ssp2",
                 .id = 1,
@@ -835,18 +837,7 @@ struct snd_soc_dai pxa_ssp_dai[] = {
                         .rates = PXA_SSP_RATES,
                         .formats = PXA_SSP_FORMATS,
                  },
-                .ops = {
-                        .startup = pxa_ssp_startup,
-                        .shutdown = pxa_ssp_shutdown,
-                        .trigger = pxa_ssp_trigger,
-                        .hw_params = pxa_ssp_hw_params,
-                        .set_sysclk = pxa_ssp_set_dai_sysclk,
-                        .set_clkdiv = pxa_ssp_set_dai_clkdiv,
-                        .set_pll = pxa_ssp_set_dai_pll,
-                        .set_fmt = pxa_ssp_set_dai_fmt,
-                        .set_tdm_slot = pxa_ssp_set_dai_tdm_slot,
-                        .set_tristate = pxa_ssp_set_dai_tristate,
-                },
+                .ops = &pxa_ssp_dai_ops,
         },
         {
                 .name = "pxa2xx-ssp3",
@@ -867,18 +858,7 @@ struct snd_soc_dai pxa_ssp_dai[] = {
                         .rates = PXA_SSP_RATES,
                         .formats = PXA_SSP_FORMATS,
                  },
-                .ops = {
-                        .startup = pxa_ssp_startup,
-                        .shutdown = pxa_ssp_shutdown,
-                        .trigger = pxa_ssp_trigger,
-                        .hw_params = pxa_ssp_hw_params,
-                        .set_sysclk = pxa_ssp_set_dai_sysclk,
-                        .set_clkdiv = pxa_ssp_set_dai_clkdiv,
-                        .set_pll = pxa_ssp_set_dai_pll,
-                        .set_fmt = pxa_ssp_set_dai_fmt,
-                        .set_tdm_slot = pxa_ssp_set_dai_tdm_slot,
-                        .set_tristate = pxa_ssp_set_dai_tristate,
-                },
+                .ops = &pxa_ssp_dai_ops,
         },
         {
                 .name = "pxa2xx-ssp4",
@@ -899,18 +879,7 @@ struct snd_soc_dai pxa_ssp_dai[] = {
                         .rates = PXA_SSP_RATES,
                         .formats = PXA_SSP_FORMATS,
                  },
-                .ops = {
-                        .startup = pxa_ssp_startup,
-                        .shutdown = pxa_ssp_shutdown,
-                        .trigger = pxa_ssp_trigger,
-                        .hw_params = pxa_ssp_hw_params,
-                        .set_sysclk = pxa_ssp_set_dai_sysclk,
-                        .set_clkdiv = pxa_ssp_set_dai_clkdiv,
-                        .set_pll = pxa_ssp_set_dai_pll,
-                        .set_fmt = pxa_ssp_set_dai_fmt,
-                        .set_tdm_slot = pxa_ssp_set_dai_tdm_slot,
-                        .set_tristate = pxa_ssp_set_dai_tristate,
-                },
+                .ops = &pxa_ssp_dai_ops,
         },
 };
 EXPORT_SYMBOL_GPL(pxa_ssp_dai);
diff --git a/sound/soc/pxa/pxa2xx-ac97.c b/sound/soc/pxa/pxa2xx-ac97.c
index 812c2b4d3e07..11cd0f289c16 100644
--- a/sound/soc/pxa/pxa2xx-ac97.c
+++ b/sound/soc/pxa/pxa2xx-ac97.c
@@ -164,6 +164,10 @@ static int pxa2xx_ac97_hw_mic_params(struct snd_pcm_substream *substream,
                 SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_22050 | SNDRV_PCM_RATE_44100 | \
                 SNDRV_PCM_RATE_48000)
 
+static struct snd_soc_dai_ops pxa_ac97_dai_ops = {
+        .hw_params      = pxa2xx_ac97_hw_params,
+};
+
 /*
  * There is only 1 physical AC97 interface for pxa2xx, but it
  * has extra fifo's that can be used for aux DACs and ADCs.
@@ -189,8 +193,7 @@ struct snd_soc_dai pxa_ac97_dai[] = {
                 .channels_max = 2,
                 .rates = PXA2XX_AC97_RATES,
                 .formats = SNDRV_PCM_FMTBIT_S16_LE,},
-        .ops = {
-                .hw_params = pxa2xx_ac97_hw_params,},
+        .ops = &pxa_ac97_dai_ops,
 },
 {
         .name = "pxa2xx-ac97-aux",
@@ -208,8 +211,7 @@ struct snd_soc_dai pxa_ac97_dai[] = {
                 .channels_max = 1,
                 .rates = PXA2XX_AC97_RATES,
                 .formats = SNDRV_PCM_FMTBIT_S16_LE,},
-        .ops = {
-                .hw_params = pxa2xx_ac97_hw_aux_params,},
+        .ops = &pxa_ac97_dai_ops,
 },
 {
         .name = "pxa2xx-ac97-mic",
@@ -221,8 +223,7 @@ struct snd_soc_dai pxa_ac97_dai[] = {
                 .channels_max = 1,
                 .rates = PXA2XX_AC97_RATES,
                 .formats = SNDRV_PCM_FMTBIT_S16_LE,},
-        .ops = {
-                .hw_params = pxa2xx_ac97_hw_mic_params,},
+        .ops = &pxa_ac97_dai_ops,
 },
 };
 
diff --git a/sound/soc/pxa/pxa2xx-i2s.c b/sound/soc/pxa/pxa2xx-i2s.c
index 83b59d7fe96e..e6c24408c5f9 100644
--- a/sound/soc/pxa/pxa2xx-i2s.c
+++ b/sound/soc/pxa/pxa2xx-i2s.c
@@ -304,6 +304,15 @@ static int pxa2xx_i2s_resume(struct snd_soc_dai *dai)
                 SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_22050 | SNDRV_PCM_RATE_44100 | \
                 SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_96000)
 
+static struct snd_soc_dai_ops pxa_i2s_dai_ops = {
+        .startup        = pxa2xx_i2s_startup,
+        .shutdown       = pxa2xx_i2s_shutdown,
+        .trigger        = pxa2xx_i2s_trigger,
+        .hw_params      = pxa2xx_i2s_hw_params,
+        .set_fmt        = pxa2xx_i2s_set_dai_fmt,
+        .set_sysclk     = pxa2xx_i2s_set_dai_sysclk,
+};
+
 struct snd_soc_dai pxa_i2s_dai = {
         .name = "pxa2xx-i2s",
         .id = 0,
@@ -319,14 +328,7 @@ struct snd_soc_dai pxa_i2s_dai = {
                 .channels_max = 2,
                 .rates = PXA2XX_I2S_RATES,
                 .formats = SNDRV_PCM_FMTBIT_S16_LE,},
-        .ops = {
-                .startup = pxa2xx_i2s_startup,
-                .shutdown = pxa2xx_i2s_shutdown,
-                .trigger = pxa2xx_i2s_trigger,
-                .hw_params = pxa2xx_i2s_hw_params,
-                .set_fmt = pxa2xx_i2s_set_dai_fmt,
-                .set_sysclk = pxa2xx_i2s_set_dai_sysclk,
-        },
+        .ops = &pxa_i2s_dai_ops,
 };
 
 EXPORT_SYMBOL_GPL(pxa_i2s_dai);