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>

3 files changed, 26 insertions, 16 deletions

diff --git a/sound/soc/s3c24xx/s3c2412-i2s.c b/sound/soc/s3c24xx/s3c2412-i2s.c
index 1ceae690d019..1ca3cdaa8213 100644
--- a/sound/soc/s3c24xx/s3c2412-i2s.c
+++ b/sound/soc/s3c24xx/s3c2412-i2s.c
@@ -147,6 +147,10 @@ static int s3c2412_i2s_probe(struct platform_device *pdev,
         SNDRV_PCM_RATE_22050 | SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 | \
         SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000)
 
+static struct snd_soc_dai_ops s3c2412_i2s_dai_ops = {
+        .set_sysclk     = s3c2412_i2s_set_sysclk,
+};
+
 struct snd_soc_dai s3c2412_i2s_dai = {
         .name           = "s3c2412-i2s",
         .id             = 0,
@@ -163,9 +167,7 @@ struct snd_soc_dai s3c2412_i2s_dai = {
                 .rates          = S3C2412_I2S_RATES,
                 .formats        = SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_S16_LE,
         },
-        .ops = {
-                .set_sysclk     = s3c2412_i2s_set_sysclk,
-        },
+        .ops = &s3c2412_i2s_dai_ops,
 };
 EXPORT_SYMBOL_GPL(s3c2412_i2s_dai);
 
diff --git a/sound/soc/s3c24xx/s3c2443-ac97.c b/sound/soc/s3c24xx/s3c2443-ac97.c
index 5c7f18a22645..3698f707c44d 100644
--- a/sound/soc/s3c24xx/s3c2443-ac97.c
+++ b/sound/soc/s3c24xx/s3c2443-ac97.c
@@ -355,6 +355,16 @@ static int s3c2443_ac97_mic_trigger(struct snd_pcm_substream *substream,
                 SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_22050 | \
                 SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000)
 
+static struct snd_soc_dai_ops s3c2443_ac97_dai_ops = {
+        .hw_params      = s3c2443_ac97_hw_params,
+        .trigger        = s3c2443_ac97_trigger,
+};
+
+static struct snd_soc_dai_ops s3c2443_ac97_mic_dai_ops = {
+        .hw_params      = s3c2443_ac97_hw_mic_params,
+        .trigger        = s3c2443_ac97_mic_trigger,
+};
+
 struct snd_soc_dai s3c2443_ac97_dai[] = {
 {
         .name = "s3c2443-ac97",
@@ -374,9 +384,7 @@ struct snd_soc_dai s3c2443_ac97_dai[] = {
                 .channels_max = 2,
                 .rates = s3c2443_AC97_RATES,
                 .formats = SNDRV_PCM_FMTBIT_S16_LE,},
-        .ops = {
-                .hw_params = s3c2443_ac97_hw_params,
-                .trigger = s3c2443_ac97_trigger},
+        .ops = &s3c2443_ac97_dai_ops,
 },
 {
         .name = "pxa2xx-ac97-mic",
@@ -388,9 +396,7 @@ struct snd_soc_dai s3c2443_ac97_dai[] = {
                 .channels_max = 1,
                 .rates = s3c2443_AC97_RATES,
                 .formats = SNDRV_PCM_FMTBIT_S16_LE,},
-        .ops = {
-                .hw_params = s3c2443_ac97_hw_mic_params,
-                .trigger = s3c2443_ac97_mic_trigger,},
+        .ops = &s3c2443_ac97_mic_dai_ops,
 },
 };
 EXPORT_SYMBOL_GPL(s3c2443_ac97_dai);
diff --git a/sound/soc/s3c24xx/s3c24xx-i2s.c b/sound/soc/s3c24xx/s3c24xx-i2s.c
index 407ccd7180fe..cc066964dad6 100644
--- a/sound/soc/s3c24xx/s3c24xx-i2s.c
+++ b/sound/soc/s3c24xx/s3c24xx-i2s.c
@@ -449,6 +449,14 @@ static int s3c24xx_i2s_resume(struct snd_soc_dai *cpu_dai)
         SNDRV_PCM_RATE_22050 | SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 | \
         SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000)
 
+static struct snd_soc_dai_ops s3c24xx_i2s_dai_ops = {
+        .trigger        = s3c24xx_i2s_trigger,
+        .hw_params      = s3c24xx_i2s_hw_params,
+        .set_fmt        = s3c24xx_i2s_set_fmt,
+        .set_clkdiv     = s3c24xx_i2s_set_clkdiv,
+        .set_sysclk     = s3c24xx_i2s_set_sysclk,
+};
+
 struct snd_soc_dai s3c24xx_i2s_dai = {
         .name = "s3c24xx-i2s",
         .id = 0,
@@ -465,13 +473,7 @@ struct snd_soc_dai s3c24xx_i2s_dai = {
                 .channels_max = 2,
                 .rates = S3C24XX_I2S_RATES,
                 .formats = SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_S16_LE,},
-        .ops = {
-                .trigger = s3c24xx_i2s_trigger,
-                .hw_params = s3c24xx_i2s_hw_params,
-                .set_fmt = s3c24xx_i2s_set_fmt,
-                .set_clkdiv = s3c24xx_i2s_set_clkdiv,
-                .set_sysclk = s3c24xx_i2s_set_sysclk,
-        },
+        .ops = &s3c24xx_i2s_dai_ops,
 };
 EXPORT_SYMBOL_GPL(s3c24xx_i2s_dai);