ASoC: core: refactor soc_link_dai_widgets()
authorVinod Koul <vinod.koul@intel.com>
Mon, 9 Nov 2015 17:49:58 +0000 (23:19 +0530)
committerMark Brown <broonie@kernel.org>
Wed, 18 Nov 2015 12:56:51 +0000 (12:56 +0000)
In soc_link_dai_widgets() we refer to local widget variables as
playback/capture_widget, but they are really sink/source widgets,
so change the names accordingly

Suggested-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/soc-core.c

index 24b0960..d5e0bcb 100644 (file)
@@ -1283,35 +1283,35 @@ static int soc_link_dai_widgets(struct snd_soc_card *card,
 {
        struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
        struct snd_soc_dai *codec_dai = rtd->codec_dai;
-       struct snd_soc_dapm_widget *play_w, *capture_w;
+       struct snd_soc_dapm_widget *sink, *source;
        int ret;
 
        if (rtd->num_codecs > 1)
                dev_warn(card->dev, "ASoC: Multiple codecs not supported yet\n");
 
        /* link the DAI widgets */
-       play_w = codec_dai->playback_widget;
-       capture_w = cpu_dai->capture_widget;
-       if (play_w && capture_w) {
+       sink = codec_dai->playback_widget;
+       source = cpu_dai->capture_widget;
+       if (sink && source) {
                ret = snd_soc_dapm_new_pcm(card, dai_link->params,
-                                          dai_link->num_params, capture_w,
-                                          play_w);
+                                          dai_link->num_params,
+                                          source, sink);
                if (ret != 0) {
                        dev_err(card->dev, "ASoC: Can't link %s to %s: %d\n",
-                               play_w->name, capture_w->name, ret);
+                               sink->name, source->name, ret);
                        return ret;
                }
        }
 
-       play_w = cpu_dai->playback_widget;
-       capture_w = codec_dai->capture_widget;
-       if (play_w && capture_w) {
+       sink = cpu_dai->playback_widget;
+       source = codec_dai->capture_widget;
+       if (sink && source) {
                ret = snd_soc_dapm_new_pcm(card, dai_link->params,
-                                          dai_link->num_params, capture_w,
-                                          play_w);
+                                          dai_link->num_params,
+                                          source, sink);
                if (ret != 0) {
                        dev_err(card->dev, "ASoC: Can't link %s to %s: %d\n",
-                               play_w->name, capture_w->name, ret);
+                               sink->name, source->name, ret);
                        return ret;
                }
        }