Unverified Commit 62daf3df authored by Simon Trimmer's avatar Simon Trimmer Committed by Mark Brown
Browse files

ALSA: hda: hda_cs_dsp_ctl: Use cs_dsp_coeff_lock_and_[read|write]_ctrl() 



Using the cs_dsp_coeff_lock_and_[read|write]_ctrl() wrappers tidies
the calling functions as it does not need to manage the DSP pwr_lock.

Signed-off-by: default avatarSimon Trimmer <simont@opensource.cirrus.com>
Signed-off-by: default avatarRichard Fitzgerald <rf@opensource.cirrus.com>
Reviewed-by: default avatarTakashi Iwai <tiwai@suse.de>
Link: https://msgid.link/r/20240325113127.112783-4-rf@opensource.cirrus.com


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

sound/pci/hda/hda_cs_dsp_ctl.c

+2 −12
Original line number Diff line number Diff line
@@ -51,13 +51,8 @@ static int hda_cs_dsp_coeff_put(struct snd_kcontrol *kctl, struct snd_ctl_elem_v 
	struct hda_cs_dsp_coeff_ctl *ctl = (struct hda_cs_dsp_coeff_ctl *)snd_kcontrol_chip(kctl);

	struct cs_dsp_coeff_ctl *cs_ctl = ctl->cs_ctl;

	char *p = ucontrol->value.bytes.data;

	int ret = 0;



	mutex_lock(&cs_ctl->dsp->pwr_lock);

	ret = cs_dsp_coeff_write_ctrl(cs_ctl, 0, p, cs_ctl->len);

	mutex_unlock(&cs_ctl->dsp->pwr_lock);



	return ret;

	return cs_dsp_coeff_lock_and_write_ctrl(cs_ctl, 0, p, cs_ctl->len);

}



static int hda_cs_dsp_coeff_get(struct snd_kcontrol *kctl, struct snd_ctl_elem_value *ucontrol)
@@ -65,13 +60,8 @@ static int hda_cs_dsp_coeff_get(struct snd_kcontrol *kctl, struct snd_ctl_elem_v 
	struct hda_cs_dsp_coeff_ctl *ctl = (struct hda_cs_dsp_coeff_ctl *)snd_kcontrol_chip(kctl);

	struct cs_dsp_coeff_ctl *cs_ctl = ctl->cs_ctl;

	char *p = ucontrol->value.bytes.data;

	int ret;



	mutex_lock(&cs_ctl->dsp->pwr_lock);

	ret = cs_dsp_coeff_read_ctrl(cs_ctl, 0, p, cs_ctl->len);

	mutex_unlock(&cs_ctl->dsp->pwr_lock);



	return ret;

	return cs_dsp_coeff_lock_and_read_ctrl(cs_ctl, 0, p, cs_ctl->len);

}



static unsigned int wmfw_convert_flags(unsigned int in)