Unverified Commit ec5dffcd authored by Amadeusz Sławiński's avatar Amadeusz Sławiński Committed by Mark Brown
Browse files

ASoC: topology: Log control load errors in soc_tplg_control_load() 



Simplify code by logging any errors in function that does the actual
work instead of doing so in its callers.

Signed-off-by: default avatarAmadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
Reviewed-by: default avatarCezary Rojewski <cezary.rojewski@intel.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20230519195611.4068853-2-amadeuszx.slawinski@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 83b3432f

sound/soc/soc-topology.c

+13 −24
Original line number Diff line number Diff line
@@ -585,11 +585,15 @@ EXPORT_SYMBOL_GPL(snd_soc_tplg_widget_bind_event); 
static int soc_tplg_control_load(struct soc_tplg *tplg,

	struct snd_kcontrol_new *k, struct snd_soc_tplg_ctl_hdr *hdr)

{

	int ret = 0;



	if (tplg->ops && tplg->ops->control_load)

		return tplg->ops->control_load(tplg->comp, tplg->index, k,

			hdr);

		ret = tplg->ops->control_load(tplg->comp, tplg->index, k, hdr);



	return 0;

	if (ret)

		dev_err(tplg->dev, "ASoC: failed to init %s\n", hdr->name);



	return ret;

}
@@ -691,10 +695,8 @@ static int soc_tplg_dbytes_create(struct soc_tplg *tplg, size_t size) 


	/* pass control to driver for optional further init */

	ret = soc_tplg_control_load(tplg, &kc, &be->hdr);

	if (ret < 0) {

		dev_err(tplg->dev, "ASoC: failed to init %s\n", be->hdr.name);

	if (ret < 0)

		goto err;

	}



	/* register control here */

	ret = soc_tplg_add_kcontrol(tplg, &kc, &sbe->dobj.control.kcontrol);
@@ -776,10 +778,8 @@ static int soc_tplg_dmixer_create(struct soc_tplg *tplg, size_t size) 


	/* pass control to driver for optional further init */

	ret = soc_tplg_control_load(tplg, &kc, &mc->hdr);

	if (ret < 0) {

		dev_err(tplg->dev, "ASoC: failed to init %s\n", mc->hdr.name);

	if (ret < 0)

		goto err;

	}



	/* register control here */

	ret = soc_tplg_add_kcontrol(tplg, &kc, &sm->dobj.control.kcontrol);
@@ -945,10 +945,8 @@ static int soc_tplg_denum_create(struct soc_tplg *tplg, size_t size) 


	/* pass control to driver for optional further init */

	ret = soc_tplg_control_load(tplg, &kc, &ec->hdr);

	if (ret < 0) {

		dev_err(tplg->dev, "ASoC: failed to init %s\n", ec->hdr.name);

	if (ret < 0)

		goto err;

	}



	/* register control here */

	ret = soc_tplg_add_kcontrol(tplg, &kc, &se->dobj.control.kcontrol);
@@ -1162,11 +1160,8 @@ static int soc_tplg_dapm_widget_dmixer_create(struct soc_tplg *tplg, struct snd_ 


	/* pass control to driver for optional further init */

	err = soc_tplg_control_load(tplg, kc, &mc->hdr);

	if (err < 0) {

		dev_err(tplg->dev, "ASoC: failed to init %s\n",

			mc->hdr.name);

	if (err < 0)

		return err;

	}



	return 0;

}
@@ -1246,11 +1241,8 @@ static int soc_tplg_dapm_widget_denum_create(struct soc_tplg *tplg, struct snd_k 


	/* pass control to driver for optional further init */

	err = soc_tplg_control_load(tplg, kc, &ec->hdr);

	if (err < 0) {

		dev_err(tplg->dev, "ASoC: failed to init %s\n",

			ec->hdr.name);

	if (err < 0)

		return err;

	}



	return 0;

}
@@ -1298,11 +1290,8 @@ static int soc_tplg_dapm_widget_dbytes_create(struct soc_tplg *tplg, struct snd_ 


	/* pass control to driver for optional further init */

	err = soc_tplg_control_load(tplg, kc, &be->hdr);

	if (err < 0) {

		dev_err(tplg->dev, "ASoC: failed to init %s\n",

			be->hdr.name);

	if (err < 0)

		return err;

	}



	return 0;

}