ASoC: Merge dai_ops factor out

Merge Eric Maio's patch to merge snd_soc_dai_ops out of line.  Fixed
merge issues and updated drivers, plus an issue with the ops for the two
s3c2443 AC97 DAIs having been merged.

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,          \
 }