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: Simon Trimmer <simont@opensource.cirrus.com>
Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com>
Reviewed-by: Takashi Iwai <tiwai@suse.de>
Link: https://msgid.link/r/20240325113127.112783-4-rf@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/pci/hda/hda_cs_dsp_ctl.c b/sound/pci/hda/hda_cs_dsp_ctl.c
index 463ca06036bfe7681992b72128f2de67b467d7da..725544d81941037dcb3d96bcdca727b284828bee 100644 (file)
--- a/sound/pci/hda/hda_cs_dsp_ctl.c
+++ b/sound/pci/hda/hda_cs_dsp_ctl.c
@@ -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)