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/codecs/tlv320aic26.c b/sound/soc/codecs/tlv320aic26.c
index 229e464cf713..a7f333fc579e 100644
--- a/sound/soc/codecs/tlv320aic26.c
+++ b/sound/soc/codecs/tlv320aic26.c
@@ -270,6 +270,13 @@ static int aic26_set_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)
 #define AIC26_FORMATS   (SNDRV_PCM_FMTBIT_S8     | SNDRV_PCM_FMTBIT_S16_BE |\
                          SNDRV_PCM_FMTBIT_S24_BE | SNDRV_PCM_FMTBIT_S32_BE)
 
+static struct snd_soc_dai_ops aic26_dai_ops = {
+        .hw_params      = aic26_hw_params,
+        .digital_mute   = aic26_mute,
+        .set_sysclk     = aic26_set_sysclk,
+        .set_fmt        = aic26_set_fmt,
+};
+
 struct snd_soc_dai aic26_dai = {
         .name = "tlv320aic26",
         .playback = {
@@ -286,12 +293,7 @@ struct snd_soc_dai aic26_dai = {
                 .rates = AIC26_RATES,
                 .formats = AIC26_FORMATS,
         },
-        .ops = {
-                .hw_params = aic26_hw_params,
-                .digital_mute = aic26_mute,
-                .set_sysclk = aic26_set_sysclk,
-                .set_fmt = aic26_set_fmt,
-        },
+        .ops = &aic26_dai_ops,
 };
 EXPORT_SYMBOL_GPL(aic26_dai);