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, 9 insertions, 7 deletions

diff --git a/sound/soc/codecs/wm8900.c b/sound/soc/codecs/wm8900.c
index da5ca64f89bb..46c5ea1ff921 100644
--- a/sound/soc/codecs/wm8900.c
+++ b/sound/soc/codecs/wm8900.c
@@ -1088,6 +1088,14 @@ static int wm8900_digital_mute(struct snd_soc_dai *codec_dai, int mute)
         (SNDRV_PCM_FORMAT_S16_LE | SNDRV_PCM_FORMAT_S20_3LE | \
          SNDRV_PCM_FORMAT_S24_LE)
 
+static struct snd_soc_dai_ops wm8900_dai_ops = {
+        .hw_params      = wm8900_hw_params,
+        .set_clkdiv     = wm8900_set_dai_clkdiv,
+        .set_pll        = wm8900_set_dai_pll,
+        .set_fmt        = wm8900_set_dai_fmt,
+        .digital_mute   = wm8900_digital_mute,
+};
+
 struct snd_soc_dai wm8900_dai = {
         .name = "WM8900 HiFi",
         .playback = {
@@ -1104,13 +1112,7 @@ struct snd_soc_dai wm8900_dai = {
                 .rates = WM8900_RATES,
                 .formats = WM8900_PCM_FORMATS,
          },
-        .ops = {
-                .hw_params = wm8900_hw_params,
-                 .set_clkdiv = wm8900_set_dai_clkdiv,
-                 .set_pll = wm8900_set_dai_pll,
-                 .set_fmt = wm8900_set_dai_fmt,
-                 .digital_mute = wm8900_digital_mute,
-         },
+        .ops = &wm8900_dai_ops,
 };
 EXPORT_SYMBOL_GPL(wm8900_dai);