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, 8 insertions, 6 deletions

diff --git a/sound/soc/blackfin/bf5xx-i2s.c b/sound/soc/blackfin/bf5xx-i2s.c
index d1d95d2393fe..964824419678 100644
--- a/sound/soc/blackfin/bf5xx-i2s.c
+++ b/sound/soc/blackfin/bf5xx-i2s.c
@@ -287,6 +287,13 @@ static int bf5xx_i2s_resume(struct platform_device *pdev,
 #define BF5XX_I2S_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S24_LE |\
         SNDRV_PCM_FMTBIT_S32_LE)
 
+static struct snd_soc_dai_ops bf5xx_i2s_dai_ops = {
+        .startup        = bf5xx_i2s_startup,
+        .shutdown       = bf5xx_i2s_shutdown,
+        .hw_params      = bf5xx_i2s_hw_params,
+        .set_fmt        = bf5xx_i2s_set_dai_fmt,
+};
+
 struct snd_soc_dai bf5xx_i2s_dai = {
         .name = "bf5xx-i2s",
         .id = 0,
@@ -304,12 +311,7 @@ struct snd_soc_dai bf5xx_i2s_dai = {
                 .channels_max = 2,
                 .rates = BF5XX_I2S_RATES,
                 .formats = BF5XX_I2S_FORMATS,},
-        .ops = {
-                .startup   = bf5xx_i2s_startup,
-                .shutdown  = bf5xx_i2s_shutdown,
-                .hw_params = bf5xx_i2s_hw_params,
-                .set_fmt = bf5xx_i2s_set_dai_fmt,
-        },
+        .ops = &bf5xx_i2s_dai_ops,
 };
 EXPORT_SYMBOL_GPL(bf5xx_i2s_dai);