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

diff --git a/sound/soc/codecs/wm8903.c b/sound/soc/codecs/wm8903.c
index c6fa8a71b4dd..8cf571f1a803 100644
--- a/sound/soc/codecs/wm8903.c
+++ b/sound/soc/codecs/wm8903.c
@@ -1497,6 +1497,15 @@ static int wm8903_hw_params(struct snd_pcm_substream *substream,
                         SNDRV_PCM_FMTBIT_S20_3LE |\
                         SNDRV_PCM_FMTBIT_S24_LE)
 
+static struct snd_soc_dai_ops wm8903_dai_ops = {
+        .startup        = wm8903_startup,
+        .shutdown       = wm8903_shutdown,
+        .hw_params      = wm8903_hw_params,
+        .digital_mute   = wm8903_digital_mute,
+        .set_fmt        = wm8903_set_dai_fmt,
+        .set_sysclk     = wm8903_set_dai_sysclk,
+};
+
 struct snd_soc_dai wm8903_dai = {
         .name = "WM8903",
         .playback = {
@@ -1513,14 +1522,7 @@ struct snd_soc_dai wm8903_dai = {
                  .rates = WM8903_CAPTURE_RATES,
                  .formats = WM8903_FORMATS,
          },
-        .ops = {
-                 .startup = wm8903_startup,
-                 .shutdown = wm8903_shutdown,
-                 .hw_params = wm8903_hw_params,
-                 .digital_mute = wm8903_digital_mute,
-                 .set_fmt = wm8903_set_dai_fmt,
-                 .set_sysclk = wm8903_set_dai_sysclk
-        }
+        .ops = &wm8903_dai_ops,
 };
 EXPORT_SYMBOL_GPL(wm8903_dai);