vt: remove superfluous parens in invert_screen and build_attr

[linux-2.6-microblaze.git] / sound / soc / samsung / littlemill.c

diff --git a/sound/soc/samsung/littlemill.c b/sound/soc/samsung/littlemill.c
index 59904f4..f4375c4 100644 (file)
--- a/sound/soc/samsung/littlemill.c
+++ b/sound/soc/samsung/littlemill.c
@@ -23,7 +23,7 @@ static int littlemill_set_bias_level(struct snd_soc_card *card,
        int ret;
 
        rtd = snd_soc_get_pcm_runtime(card, &card->dai_link[0]);
-       aif1_dai = rtd->codec_dai;
+       aif1_dai = asoc_rtd_to_codec(rtd, 0);
 
        if (dapm->dev != aif1_dai->dev)
                return 0;
@@ -70,7 +70,7 @@ static int littlemill_set_bias_level_post(struct snd_soc_card *card,
        int ret;
 
        rtd = snd_soc_get_pcm_runtime(card, &card->dai_link[0]);
-       aif1_dai = rtd->codec_dai;
+       aif1_dai = asoc_rtd_to_codec(rtd, 0);
 
        if (dapm->dev != aif1_dai->dev)
                return 0;
@@ -105,7 +105,7 @@ static int littlemill_hw_params(struct snd_pcm_substream *substream,
                                struct snd_pcm_hw_params *params)
 {
        struct snd_soc_pcm_runtime *rtd = substream->private_data;
-       struct snd_soc_dai *codec_dai = rtd->codec_dai;
+       struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0);
        int ret;
 
        sample_rate = params_rate(params);
@@ -181,7 +181,7 @@ static int bbclk_ev(struct snd_soc_dapm_widget *w,
        int ret;
 
        rtd = snd_soc_get_pcm_runtime(card, &card->dai_link[1]);
-       aif2_dai = rtd->cpu_dai;
+       aif2_dai = asoc_rtd_to_cpu(rtd, 0);
 
        switch (event) {
        case SND_SOC_DAPM_PRE_PMU:
@@ -264,11 +264,11 @@ static int littlemill_late_probe(struct snd_soc_card *card)
        int ret;
 
        rtd = snd_soc_get_pcm_runtime(card, &card->dai_link[0]);
-       component = rtd->codec_dai->component;
-       aif1_dai = rtd->codec_dai;
+       component = asoc_rtd_to_codec(rtd, 0)->component;
+       aif1_dai = asoc_rtd_to_codec(rtd, 0);
 
        rtd = snd_soc_get_pcm_runtime(card, &card->dai_link[1]);
-       aif2_dai = rtd->cpu_dai;
+       aif2_dai = asoc_rtd_to_cpu(rtd, 0);
 
        ret = snd_soc_dai_set_sysclk(aif1_dai, WM8994_SYSCLK_MCLK2,
                                     32768, SND_SOC_CLOCK_IN);
@@ -325,7 +325,7 @@ static int littlemill_probe(struct platform_device *pdev)
        card->dev = &pdev->dev;
 
        ret = devm_snd_soc_register_card(&pdev->dev, card);
-       if (ret)
+       if (ret && ret != -EPROBE_DEFER)
                dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n",
                        ret);