Merge remote-tracking branches 'asoc/topic/rt5670', 'asoc/topic/rt5677', 'asoc/topic...

[firefly-linux-kernel-4.4.55.git] / sound / soc / ux500 / mop500_ab8500.c

diff --git a/sound/soc/ux500/mop500_ab8500.c b/sound/soc/ux500/mop500_ab8500.c
index be4f1ac7cd5ec74afe25f4b1126751790183afef..aa65370db82aa52fb480871eb06bd5dfed667d3b 100644 (file)
--- a/sound/soc/ux500/mop500_ab8500.c
+++ b/sound/soc/ux500/mop500_ab8500.c
@@ -290,21 +290,9 @@ static int mop500_ab8500_hw_params(struct snd_pcm_substream *substream,
                        SND_SOC_DAIFMT_GATED;
        }
 
-       ret = snd_soc_dai_set_fmt(codec_dai, fmt);
-       if (ret < 0) {
-               dev_err(dev,
-                       "%s: ERROR: snd_soc_dai_set_fmt failed for codec_dai (ret = %d)!\n",
-                       __func__, ret);
-               return ret;
-       }
-
-       ret = snd_soc_dai_set_fmt(cpu_dai, fmt);
-       if (ret < 0) {
-               dev_err(dev,
-                       "%s: ERROR: snd_soc_dai_set_fmt failed for cpu_dai (ret = %d)!\n",
-                       __func__, ret);
+       ret = snd_soc_runtime_set_dai_fmt(rtd, fmt);
+       if (ret)
                return ret;
-       }
 
        /* Setup TDM-slots */