Commit e59db12b authored by Amadeusz Sławiński's avatar Amadeusz Sławiński Committed by Mark Brown

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: default avatarGuennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Signed-off-by: default avatarAmadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
Reviewed-by: default avatarCezary Rojewski <cezary.rojewski@intel.com>
Link: https://lore.kernel.org/r/20201030145427.3497990-4-amadeuszx.slawinski@linux.intel.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent a5b8f71c
...@@ -1865,7 +1865,7 @@ static int soc_tplg_dai_create(struct soc_tplg *tplg, ...@@ -1865,7 +1865,7 @@ static int soc_tplg_dai_create(struct soc_tplg *tplg,
/* pass control to component driver for optional further init */ /* pass control to component driver for optional further init */
ret = soc_tplg_dai_load(tplg, dai_drv, pcm, NULL); ret = soc_tplg_dai_load(tplg, dai_drv, pcm, NULL);
if (ret < 0) { if (ret < 0) {
dev_err(tplg->comp->dev, "ASoC: DAI loading failed\n"); dev_err(tplg->dev, "ASoC: DAI loading failed\n");
goto err; goto err;
} }
...@@ -1875,7 +1875,7 @@ static int soc_tplg_dai_create(struct soc_tplg *tplg, ...@@ -1875,7 +1875,7 @@ static int soc_tplg_dai_create(struct soc_tplg *tplg,
list_add(&dai_drv->dobj.list, &tplg->comp->dobj_list); list_add(&dai_drv->dobj.list, &tplg->comp->dobj_list);
/* register the DAI to the component */ /* 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) if (!dai)
return -ENOMEM; return -ENOMEM;
...@@ -1982,13 +1982,13 @@ static int soc_tplg_fe_link_create(struct soc_tplg *tplg, ...@@ -1982,13 +1982,13 @@ static int soc_tplg_fe_link_create(struct soc_tplg *tplg,
/* pass control to component driver for optional further init */ /* pass control to component driver for optional further init */
ret = soc_tplg_dai_link_load(tplg, link, NULL); ret = soc_tplg_dai_link_load(tplg, link, NULL);
if (ret < 0) { 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; goto err;
} }
ret = snd_soc_add_pcm_runtime(tplg->comp->card, link); ret = snd_soc_add_pcm_runtime(tplg->comp->card, link);
if (ret < 0) { 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; goto err;
} }
...@@ -2493,7 +2493,7 @@ static int soc_tplg_dai_config(struct soc_tplg *tplg, ...@@ -2493,7 +2493,7 @@ static int soc_tplg_dai_config(struct soc_tplg *tplg,
/* pass control to component driver for optional further init */ /* pass control to component driver for optional further init */
ret = soc_tplg_dai_load(tplg, dai_drv, NULL, dai); ret = soc_tplg_dai_load(tplg, dai_drv, NULL, dai);
if (ret < 0) { if (ret < 0) {
dev_err(tplg->comp->dev, "ASoC: DAI loading failed\n"); dev_err(tplg->dev, "ASoC: DAI loading failed\n");
goto err; goto err;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment