Unverified Commit e8010efc authored by Charles Keepax's avatar Charles Keepax Committed by Mark Brown
Browse files

ASoC: wm_adsp: Minor clean and redundant code removal 



The cs_dsp core will return an error if passed a NULL cs_dsp struct so
there is no need for the wm_adsp_write|read_ctl functions to manually
check that. The cs_dsp core will also check the data is within bounds of
the control so the additional bounds check is redundant too. Simplify
things a bit by removing said code.

Signed-off-by: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20220630101459.3442327-1-ckeepax@opensource.cirrus.com


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

sound/soc/codecs/wm_adsp.c

+5 −20
Original line number Diff line number Diff line
@@ -675,21 +675,12 @@ static void wm_adsp_control_remove(struct cs_dsp_coeff_ctl *cs_ctl) 
int wm_adsp_write_ctl(struct wm_adsp *dsp, const char *name, int type,

		      unsigned int alg, void *buf, size_t len)

{

	struct cs_dsp_coeff_ctl *cs_ctl;

	struct cs_dsp_coeff_ctl *cs_ctl = cs_dsp_get_ctl(&dsp->cs_dsp, name, type, alg);

	struct wm_coeff_ctl *ctl;

	struct snd_kcontrol *kcontrol;

	char ctl_name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN];

	int ret;



	cs_ctl = cs_dsp_get_ctl(&dsp->cs_dsp, name, type, alg);

	if (!cs_ctl)

		return -EINVAL;



	ctl = cs_ctl->priv;



	if (len > cs_ctl->len)

		return -EINVAL;



	ret = cs_dsp_coeff_write_ctrl(cs_ctl, 0, buf, len);

	if (ret)

		return ret;
@@ -697,6 +688,8 @@ int wm_adsp_write_ctl(struct wm_adsp *dsp, const char *name, int type, 
	if (cs_ctl->flags & WMFW_CTL_FLAG_SYS)

		return 0;



	ctl = cs_ctl->priv;



	if (dsp->component->name_prefix)

		snprintf(ctl_name, SNDRV_CTL_ELEM_ID_NAME_MAXLEN, "%s %s",

			 dsp->component->name_prefix, ctl->name);
@@ -720,16 +713,8 @@ EXPORT_SYMBOL_GPL(wm_adsp_write_ctl); 
int wm_adsp_read_ctl(struct wm_adsp *dsp, const char *name, int type,

		     unsigned int alg, void *buf, size_t len)

{

	struct cs_dsp_coeff_ctl *cs_ctl;



	cs_ctl = cs_dsp_get_ctl(&dsp->cs_dsp, name, type, alg);

	if (!cs_ctl)

		return -EINVAL;



	if (len > cs_ctl->len)

		return -EINVAL;



	return cs_dsp_coeff_read_ctrl(cs_ctl, 0, buf, len);

	return cs_dsp_coeff_read_ctrl(cs_dsp_get_ctl(&dsp->cs_dsp, name, type, alg),

				      0, buf, len);

}

EXPORT_SYMBOL_GPL(wm_adsp_read_ctl);