1 files changed, 17 insertions, 48 deletions

diff --git a/sound/soc/pxa/pxa-ssp.c b/sound/soc/pxa/pxa-ssp.c
index 52d97c4b82b1..d3fa6357a9fd 100644
--- a/sound/soc/pxa/pxa-ssp.c
+++ b/sound/soc/pxa/pxa-ssp.c
@@ -794,6 +794,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",
@@ -814,18 +827,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,
@@ -845,18 +847,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",
@@ -877,18 +868,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",
@@ -909,18 +889,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);