ASoC: topology: Unify all device references

In few places tplg->comp->dev is used, while everywhere else tplg->dev
is being used. Unify those uses towards tplg->dev, as it is being set to
comp->dev during initialization anyway.

Reviewed-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
Reviewed-by: Cezary Rojewski <cezary.rojewski@intel.com>
Link: https://lore.kernel.org/r/20201030145427.3497990-4-amadeuszx.slawinski@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c
index 2a71cec7277e96b5bd2419c0c24bff7d80d888de..9d95c1b01c5a52c8e4a0b706602006fe7b70ab21 100644 (file)
--- a/sound/soc/soc-topology.c
+++ b/sound/soc/soc-topology.c
@@ -1865,7 +1865,7 @@ static int soc_tplg_dai_create(struct soc_tplg *tplg,
        /* pass control to component driver for optional further init */
        ret = soc_tplg_dai_load(tplg, dai_drv, pcm, NULL);
        if (ret < 0) {
-               dev_err(tplg->comp->dev, "ASoC: DAI loading failed\n");
+               dev_err(tplg->dev, "ASoC: DAI loading failed\n");
                goto err;
        }
 
@@ -1875,7 +1875,7 @@ static int soc_tplg_dai_create(struct soc_tplg *tplg,
        list_add(&dai_drv->dobj.list, &tplg->comp->dobj_list);
 
        /* register the DAI to the component */
-       dai = devm_snd_soc_register_dai(tplg->comp->dev, tplg->comp, dai_drv, false);
+       dai = devm_snd_soc_register_dai(tplg->dev, tplg->comp, dai_drv, false);
        if (!dai)
                return -ENOMEM;
 
@@ -1982,13 +1982,13 @@ static int soc_tplg_fe_link_create(struct soc_tplg *tplg,
        /* pass control to component driver for optional further init */
        ret = soc_tplg_dai_link_load(tplg, link, NULL);
        if (ret < 0) {
-               dev_err(tplg->comp->dev, "ASoC: FE link loading failed\n");
+               dev_err(tplg->dev, "ASoC: FE link loading failed\n");
                goto err;
        }
 
        ret = snd_soc_add_pcm_runtime(tplg->comp->card, link);
        if (ret < 0) {
-               dev_err(tplg->comp->dev, "ASoC: adding FE link failed\n");
+               dev_err(tplg->dev, "ASoC: adding FE link failed\n");
                goto err;
        }
 
@@ -2493,7 +2493,7 @@ static int soc_tplg_dai_config(struct soc_tplg *tplg,
        /* pass control to component driver for optional further init */
        ret = soc_tplg_dai_load(tplg, dai_drv, NULL, dai);
        if (ret < 0) {
-               dev_err(tplg->comp->dev, "ASoC: DAI loading failed\n");
+               dev_err(tplg->dev, "ASoC: DAI loading failed\n");
                goto err;
        }