ASoC: Merge snd_soc_ops into snd_soc_dai_ops

Liam Girdwood's ASoC v2 work avoids having two different ops structures
for DAIs by merging the members of struct snd_soc_ops into struct
snd_soc_dai_ops, allowing per DAI configuration for everything.
Backport this change.

This paves the way for future work allowing any combination of DAIs to
be connected rather than having fixed purpose CODEC and CPU DAIs and
only allowing CODEC<->CPU interconnections.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

1 files changed, 6 insertions, 9 deletions

diff --git a/sound/soc/codecs/uda1380.c b/sound/soc/codecs/uda1380.c
index a69ee72a7af5..330877c70699 100644
--- a/sound/soc/codecs/uda1380.c
+++ b/sound/soc/codecs/uda1380.c
@@ -407,7 +407,8 @@ static int uda1380_set_dai_fmt(struct snd_soc_dai *codec_dai,
  * when the DAI is being clocked by the CPU DAI. It's up to the
  * machine and cpu DAI driver to do this before we are called.
  */
-static int uda1380_pcm_prepare(struct snd_pcm_substream *substream)
+static int uda1380_pcm_prepare(struct snd_pcm_substream *substream,
+                               struct snd_soc_dai *dai)
 {
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
         struct snd_soc_device *socdev = rtd->socdev;
@@ -439,7 +440,8 @@ static int uda1380_pcm_prepare(struct snd_pcm_substream *substream)
 }
 
 static int uda1380_pcm_hw_params(struct snd_pcm_substream *substream,
-        struct snd_pcm_hw_params *params)
+                                 struct snd_pcm_hw_params *params,
+                                 struct snd_soc_dai *dai)
 {
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
         struct snd_soc_device *socdev = rtd->socdev;
@@ -477,7 +479,8 @@ static int uda1380_pcm_hw_params(struct snd_pcm_substream *substream,
         return 0;
 }
 
-static void uda1380_pcm_shutdown(struct snd_pcm_substream *substream)
+static void uda1380_pcm_shutdown(struct snd_pcm_substream *substream,
+                                 struct snd_soc_dai *dai)
 {
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
         struct snd_soc_device *socdev = rtd->socdev;
@@ -560,8 +563,6 @@ struct snd_soc_dai uda1380_dai[] = {
                 .hw_params = uda1380_pcm_hw_params,
                 .shutdown = uda1380_pcm_shutdown,
                 .prepare = uda1380_pcm_prepare,
-        },
-        .dai_ops = {
                 .digital_mute = uda1380_mute,
                 .set_fmt = uda1380_set_dai_fmt,
         },
@@ -579,8 +580,6 @@ struct snd_soc_dai uda1380_dai[] = {
                 .hw_params = uda1380_pcm_hw_params,
                 .shutdown = uda1380_pcm_shutdown,
                 .prepare = uda1380_pcm_prepare,
-        },
-        .dai_ops = {
                 .digital_mute = uda1380_mute,
                 .set_fmt = uda1380_set_dai_fmt,
         },
@@ -598,8 +597,6 @@ struct snd_soc_dai uda1380_dai[] = {
                 .hw_params = uda1380_pcm_hw_params,
                 .shutdown = uda1380_pcm_shutdown,
                 .prepare = uda1380_pcm_prepare,
-        },
-        .dai_ops = {
                 .set_fmt = uda1380_set_dai_fmt,
         },
 },