Commit 49b0dea1 authored by Stefan Binding's avatar Stefan Binding Committed by Takashi Iwai
Browse files

ALSA: hda: hda_cs_dsp_ctl: 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 hda_cs_dsp_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 avatarStefan Binding <sbinding@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20221011143552.621792-2-sbinding@opensource.cirrus.com


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 97d91787

sound/pci/hda/hda_cs_dsp_ctl.c

+4 −13
Original line number Diff line number Diff line
@@ -199,16 +199,10 @@ EXPORT_SYMBOL_NS_GPL(hda_cs_dsp_control_remove, SND_HDA_CS_DSP_CONTROLS); 
int hda_cs_dsp_write_ctl(struct cs_dsp *dsp, const char *name, int type,

			 unsigned int alg, const void *buf, size_t len)

{

	struct cs_dsp_coeff_ctl *cs_ctl;

	struct cs_dsp_coeff_ctl *cs_ctl = cs_dsp_get_ctl(dsp, name, type, alg);

	struct hda_cs_dsp_coeff_ctl *ctl;

	int ret;



	cs_ctl = cs_dsp_get_ctl(dsp, name, type, alg);

	if (!cs_ctl)

		return -EINVAL;



	ctl = cs_ctl->priv;



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

	if (ret)

		return ret;
@@ -216,6 +210,8 @@ int hda_cs_dsp_write_ctl(struct cs_dsp *dsp, const char *name, int type, 
	if (cs_ctl->flags & WMFW_CTL_FLAG_SYS)

		return 0;



	ctl = cs_ctl->priv;



	snd_ctl_notify(ctl->card, SNDRV_CTL_EVENT_MASK_VALUE, &ctl->kctl->id);



	return 0;
@@ -225,13 +221,8 @@ EXPORT_SYMBOL_NS_GPL(hda_cs_dsp_write_ctl, SND_HDA_CS_DSP_CONTROLS); 
int hda_cs_dsp_read_ctl(struct cs_dsp *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, name, type, alg);

	if (!cs_ctl)

		return -EINVAL;

	return cs_dsp_coeff_read_ctrl(cs_dsp_get_ctl(dsp, name, type, alg), 0, buf, len);



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

}

EXPORT_SYMBOL_NS_GPL(hda_cs_dsp_read_ctl, SND_HDA_CS_DSP_CONTROLS);