mirror of
https://github.com/torvalds/linux.git
synced 2026-06-02 19:43:40 +02:00
ALSA: hda/ca0132: Use cleanup macros for PM controls
The new macro CLASS(snd_hda_power) can replace the manual snd_hda_power_up() and _down() calls as well as the *_pm_*() variants gracefully. Merely code cleanups and no functional changes. Signed-off-by: Takashi Iwai <tiwai@suse.de> Link: https://patch.msgid.link/20250827072916.31933-3-tiwai@suse.de
This commit is contained in:
Takashi Iwai
parent
5d8c9c987f
commit
e056e8e14c
|
|
@ -4236,21 +4236,19 @@ static const unsigned int equalizer_vals_lookup[] = {
|
|||
static int tuning_ctl_set(struct hda_codec *codec, hda_nid_t nid,
|
||||
const unsigned int *lookup, int idx)
|
||||
{
|
||||
int i = 0;
|
||||
int i;
|
||||
|
||||
for (i = 0; i < TUNING_CTLS_COUNT; i++)
|
||||
if (nid == ca0132_tuning_ctls[i].nid)
|
||||
goto found;
|
||||
for (i = 0; i < TUNING_CTLS_COUNT; i++) {
|
||||
if (nid == ca0132_tuning_ctls[i].nid) {
|
||||
CLASS(snd_hda_power, pm)(codec);
|
||||
dspio_set_param(codec, ca0132_tuning_ctls[i].mid, 0x20,
|
||||
ca0132_tuning_ctls[i].req,
|
||||
&(lookup[idx]), sizeof(unsigned int));
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
return -EINVAL;
|
||||
found:
|
||||
snd_hda_power_up(codec);
|
||||
dspio_set_param(codec, ca0132_tuning_ctls[i].mid, 0x20,
|
||||
ca0132_tuning_ctls[i].req,
|
||||
&(lookup[idx]), sizeof(unsigned int));
|
||||
snd_hda_power_down(codec);
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
static int tuning_ctl_get(struct snd_kcontrol *kcontrol,
|
||||
|
|
@ -4465,7 +4463,7 @@ static int ca0132_select_out(struct hda_codec *codec)
|
|||
|
||||
codec_dbg(codec, "ca0132_select_out\n");
|
||||
|
||||
snd_hda_power_up_pm(codec);
|
||||
CLASS(snd_hda_power_pm, pm)(codec);
|
||||
|
||||
auto_jack = spec->vnode_lswitch[VNID_HP_ASEL - VNODE_START_NID];
|
||||
|
||||
|
|
@ -4486,12 +4484,12 @@ static int ca0132_select_out(struct hda_codec *codec)
|
|||
tmp = FLOAT_ONE;
|
||||
err = dspio_set_uint_param(codec, 0x80, 0x04, tmp);
|
||||
if (err < 0)
|
||||
goto exit;
|
||||
return err;
|
||||
/*enable speaker EQ*/
|
||||
tmp = FLOAT_ONE;
|
||||
err = dspio_set_uint_param(codec, 0x8f, 0x00, tmp);
|
||||
if (err < 0)
|
||||
goto exit;
|
||||
return err;
|
||||
|
||||
/* Setup EAPD */
|
||||
snd_hda_codec_write(codec, spec->out_pins[1], 0,
|
||||
|
|
@ -4519,12 +4517,12 @@ static int ca0132_select_out(struct hda_codec *codec)
|
|||
tmp = FLOAT_ZERO;
|
||||
err = dspio_set_uint_param(codec, 0x80, 0x04, tmp);
|
||||
if (err < 0)
|
||||
goto exit;
|
||||
return err;
|
||||
/*disable speaker EQ*/
|
||||
tmp = FLOAT_ZERO;
|
||||
err = dspio_set_uint_param(codec, 0x8f, 0x00, tmp);
|
||||
if (err < 0)
|
||||
goto exit;
|
||||
return err;
|
||||
|
||||
/* Setup EAPD */
|
||||
snd_hda_codec_write(codec, spec->out_pins[0], 0,
|
||||
|
|
@ -4548,10 +4546,7 @@ static int ca0132_select_out(struct hda_codec *codec)
|
|||
pin_ctl | PIN_HP);
|
||||
}
|
||||
|
||||
exit:
|
||||
snd_hda_power_down_pm(codec);
|
||||
|
||||
return err < 0 ? err : 0;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int ae5_headphone_gain_set(struct hda_codec *codec, long val);
|
||||
|
|
@ -4775,7 +4770,7 @@ static int ca0132_alt_select_out(struct hda_codec *codec)
|
|||
|
||||
codec_dbg(codec, "%s\n", __func__);
|
||||
|
||||
snd_hda_power_up_pm(codec);
|
||||
CLASS(snd_hda_power_pm, pm)(codec);
|
||||
|
||||
auto_jack = spec->vnode_lswitch[VNID_HP_ASEL - VNODE_START_NID];
|
||||
|
||||
|
|
@ -4800,11 +4795,11 @@ static int ca0132_alt_select_out(struct hda_codec *codec)
|
|||
/* Begin DSP output switch, mute DSP volume. */
|
||||
err = dspio_set_uint_param(codec, 0x96, SPEAKER_TUNING_MUTE, FLOAT_ONE);
|
||||
if (err < 0)
|
||||
goto exit;
|
||||
return err;
|
||||
|
||||
err = ca0132_alt_select_out_quirk_set(codec);
|
||||
if (err < 0)
|
||||
goto exit;
|
||||
return err;
|
||||
|
||||
switch (spec->cur_out_type) {
|
||||
case SPEAKER_OUT:
|
||||
|
|
@ -4835,7 +4830,7 @@ static int ca0132_alt_select_out(struct hda_codec *codec)
|
|||
|
||||
err = dspio_set_uint_param(codec, 0x80, 0x04, tmp);
|
||||
if (err < 0)
|
||||
goto exit;
|
||||
return err;
|
||||
|
||||
break;
|
||||
case HEADPHONE_OUT:
|
||||
|
|
@ -4862,7 +4857,7 @@ static int ca0132_alt_select_out(struct hda_codec *codec)
|
|||
err = dspio_set_uint_param(codec, 0x80, 0x04, FLOAT_ZERO);
|
||||
|
||||
if (err < 0)
|
||||
goto exit;
|
||||
return err;
|
||||
break;
|
||||
}
|
||||
/*
|
||||
|
|
@ -4877,7 +4872,7 @@ static int ca0132_alt_select_out(struct hda_codec *codec)
|
|||
/* Set speaker EQ bypass attenuation to 0. */
|
||||
err = dspio_set_uint_param(codec, 0x8f, 0x01, FLOAT_ZERO);
|
||||
if (err < 0)
|
||||
goto exit;
|
||||
return err;
|
||||
|
||||
/*
|
||||
* Although unused on all cards but the AE series, this is always set
|
||||
|
|
@ -4886,7 +4881,7 @@ static int ca0132_alt_select_out(struct hda_codec *codec)
|
|||
err = dspio_set_uint_param(codec, 0x96,
|
||||
SPEAKER_TUNING_USE_SPEAKER_EQ, FLOAT_ZERO);
|
||||
if (err < 0)
|
||||
goto exit;
|
||||
return err;
|
||||
|
||||
if (spec->cur_out_type == SPEAKER_OUT)
|
||||
err = ca0132_alt_surround_set_bass_redirection(codec,
|
||||
|
|
@ -4894,24 +4889,21 @@ static int ca0132_alt_select_out(struct hda_codec *codec)
|
|||
else
|
||||
err = ca0132_alt_surround_set_bass_redirection(codec, 0);
|
||||
if (err < 0)
|
||||
goto exit;
|
||||
return err;
|
||||
|
||||
/* Unmute DSP now that we're done with output selection. */
|
||||
err = dspio_set_uint_param(codec, 0x96,
|
||||
SPEAKER_TUNING_MUTE, FLOAT_ZERO);
|
||||
if (err < 0)
|
||||
goto exit;
|
||||
return err;
|
||||
|
||||
if (spec->cur_out_type == SPEAKER_OUT) {
|
||||
err = ca0132_alt_set_full_range_speaker(codec);
|
||||
if (err < 0)
|
||||
goto exit;
|
||||
return err;
|
||||
}
|
||||
|
||||
exit:
|
||||
snd_hda_power_down_pm(codec);
|
||||
|
||||
return err < 0 ? err : 0;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void ca0132_unsol_hp_delayed(struct work_struct *work)
|
||||
|
|
@ -5059,7 +5051,7 @@ static int ca0132_select_mic(struct hda_codec *codec)
|
|||
|
||||
codec_dbg(codec, "ca0132_select_mic\n");
|
||||
|
||||
snd_hda_power_up_pm(codec);
|
||||
CLASS(snd_hda_power_pm, pm)(codec);
|
||||
|
||||
auto_jack = spec->vnode_lswitch[VNID_AMIC1_ASEL - VNODE_START_NID];
|
||||
|
||||
|
|
@ -5092,8 +5084,6 @@ static int ca0132_select_mic(struct hda_codec *codec)
|
|||
ca0132_effects_set(codec, VOICE_FOCUS, 0);
|
||||
}
|
||||
|
||||
snd_hda_power_down_pm(codec);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -5110,7 +5100,7 @@ static int ca0132_alt_select_in(struct hda_codec *codec)
|
|||
|
||||
codec_dbg(codec, "%s\n", __func__);
|
||||
|
||||
snd_hda_power_up_pm(codec);
|
||||
CLASS(snd_hda_power_pm, pm)(codec);
|
||||
|
||||
chipio_set_stream_control(codec, 0x03, 0);
|
||||
chipio_set_stream_control(codec, 0x04, 0);
|
||||
|
|
@ -5273,7 +5263,6 @@ static int ca0132_alt_select_in(struct hda_codec *codec)
|
|||
}
|
||||
ca0132_cvoice_switch_set(codec);
|
||||
|
||||
snd_hda_power_down_pm(codec);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -5611,12 +5600,10 @@ static int ca0132_vnode_switch_set(struct snd_kcontrol *kcontrol,
|
|||
static void ca0132_alt_bass_redirection_xover_set(struct hda_codec *codec,
|
||||
long idx)
|
||||
{
|
||||
snd_hda_power_up(codec);
|
||||
CLASS(snd_hda_power, pm)(codec);
|
||||
|
||||
dspio_set_param(codec, 0x96, 0x20, SPEAKER_BASS_REDIRECT_XOVER_FREQ,
|
||||
&(float_xbass_xover_lookup[idx]), sizeof(unsigned int));
|
||||
|
||||
snd_hda_power_down(codec);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -5642,7 +5629,7 @@ static int ca0132_alt_slider_ctl_set(struct hda_codec *codec, hda_nid_t nid,
|
|||
else
|
||||
y = 1;
|
||||
|
||||
snd_hda_power_up(codec);
|
||||
CLASS(snd_hda_power, pm)(codec);
|
||||
if (nid == XBASS_XOVER) {
|
||||
for (i = 0; i < OUT_EFFECTS_COUNT; i++)
|
||||
if (ca0132_effects[i].nid == X_BASS)
|
||||
|
|
@ -5662,8 +5649,6 @@ static int ca0132_alt_slider_ctl_set(struct hda_codec *codec, hda_nid_t nid,
|
|||
&(lookup[idx]), sizeof(unsigned int));
|
||||
}
|
||||
|
||||
snd_hda_power_down(codec);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -6342,12 +6327,11 @@ static int ca0132_switch_put(struct snd_kcontrol *kcontrol,
|
|||
hda_nid_t nid = get_amp_nid(kcontrol);
|
||||
int ch = get_amp_channels(kcontrol);
|
||||
long *valp = ucontrol->value.integer.value;
|
||||
int changed = 1;
|
||||
|
||||
codec_dbg(codec, "ca0132_switch_put: nid=0x%x, val=%ld\n",
|
||||
nid, *valp);
|
||||
|
||||
snd_hda_power_up(codec);
|
||||
CLASS(snd_hda_power, pm)(codec);
|
||||
/* vnode */
|
||||
if ((nid >= VNODE_START_NID) && (nid < VNODE_END_NID)) {
|
||||
if (ch & 1) {
|
||||
|
|
@ -6358,30 +6342,26 @@ static int ca0132_switch_put(struct snd_kcontrol *kcontrol,
|
|||
spec->vnode_rswitch[nid - VNODE_START_NID] = *valp;
|
||||
valp++;
|
||||
}
|
||||
changed = ca0132_vnode_switch_set(kcontrol, ucontrol);
|
||||
goto exit;
|
||||
return ca0132_vnode_switch_set(kcontrol, ucontrol);
|
||||
}
|
||||
|
||||
/* PE */
|
||||
if (nid == PLAY_ENHANCEMENT) {
|
||||
spec->effects_switch[nid - EFFECT_START_NID] = *valp;
|
||||
changed = ca0132_pe_switch_set(codec);
|
||||
goto exit;
|
||||
return ca0132_pe_switch_set(codec);
|
||||
}
|
||||
|
||||
/* CrystalVoice */
|
||||
if (nid == CRYSTAL_VOICE) {
|
||||
spec->effects_switch[nid - EFFECT_START_NID] = *valp;
|
||||
changed = ca0132_cvoice_switch_set(codec);
|
||||
goto exit;
|
||||
return ca0132_cvoice_switch_set(codec);
|
||||
}
|
||||
|
||||
/* out and in effects */
|
||||
if (((nid >= OUT_EFFECT_START_NID) && (nid < OUT_EFFECT_END_NID)) ||
|
||||
((nid >= IN_EFFECT_START_NID) && (nid < IN_EFFECT_END_NID))) {
|
||||
spec->effects_switch[nid - EFFECT_START_NID] = *valp;
|
||||
changed = ca0132_effects_set(codec, nid, *valp);
|
||||
goto exit;
|
||||
return ca0132_effects_set(codec, nid, *valp);
|
||||
}
|
||||
|
||||
/* mic boost */
|
||||
|
|
@ -6389,24 +6369,22 @@ static int ca0132_switch_put(struct snd_kcontrol *kcontrol,
|
|||
spec->cur_mic_boost = *valp;
|
||||
if (ca0132_use_alt_functions(spec)) {
|
||||
if (spec->in_enum_val != REAR_LINE_IN)
|
||||
changed = ca0132_mic_boost_set(codec, *valp);
|
||||
return ca0132_mic_boost_set(codec, *valp);
|
||||
} else {
|
||||
/* Mic boost does not apply to Digital Mic */
|
||||
if (spec->cur_mic_type != DIGITAL_MIC)
|
||||
changed = ca0132_mic_boost_set(codec, *valp);
|
||||
return ca0132_mic_boost_set(codec, *valp);
|
||||
}
|
||||
|
||||
goto exit;
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (nid == ZXR_HEADPHONE_GAIN) {
|
||||
spec->zxr_gain_set = *valp;
|
||||
if (spec->cur_out_type == HEADPHONE_OUT)
|
||||
changed = zxr_headphone_gain_set(codec, *valp);
|
||||
return zxr_headphone_gain_set(codec, *valp);
|
||||
else
|
||||
changed = 0;
|
||||
|
||||
goto exit;
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (nid == SPEAKER_FULL_RANGE_FRONT || nid == SPEAKER_FULL_RANGE_REAR) {
|
||||
|
|
@ -6414,7 +6392,7 @@ static int ca0132_switch_put(struct snd_kcontrol *kcontrol,
|
|||
if (spec->cur_out_type == SPEAKER_OUT)
|
||||
ca0132_alt_set_full_range_speaker(codec);
|
||||
|
||||
changed = 0;
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (nid == BASS_REDIRECTION) {
|
||||
|
|
@ -6422,12 +6400,10 @@ static int ca0132_switch_put(struct snd_kcontrol *kcontrol,
|
|||
if (spec->cur_out_type == SPEAKER_OUT)
|
||||
ca0132_alt_surround_set_bass_redirection(codec, *valp);
|
||||
|
||||
changed = 0;
|
||||
return 0;
|
||||
}
|
||||
|
||||
exit:
|
||||
snd_hda_power_down(codec);
|
||||
return changed;
|
||||
return 1;
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -6555,7 +6531,7 @@ static int ca0132_volume_put(struct snd_kcontrol *kcontrol,
|
|||
int dir = get_amp_direction(kcontrol);
|
||||
unsigned long pval;
|
||||
|
||||
snd_hda_power_up(codec);
|
||||
CLASS(snd_hda_power, pm)(codec);
|
||||
mutex_lock(&codec->control_mutex);
|
||||
pval = kcontrol->private_value;
|
||||
kcontrol->private_value = HDA_COMPOSE_AMP_VAL(shared_nid, ch,
|
||||
|
|
@ -6563,7 +6539,6 @@ static int ca0132_volume_put(struct snd_kcontrol *kcontrol,
|
|||
changed = snd_hda_mixer_amp_volume_put(kcontrol, ucontrol);
|
||||
kcontrol->private_value = pval;
|
||||
mutex_unlock(&codec->control_mutex);
|
||||
snd_hda_power_down(codec);
|
||||
}
|
||||
|
||||
return changed;
|
||||
|
|
@ -6604,12 +6579,11 @@ static int ca0132_alt_volume_put(struct snd_kcontrol *kcontrol,
|
|||
valp++;
|
||||
}
|
||||
|
||||
snd_hda_power_up(codec);
|
||||
CLASS(snd_hda_power, pm)(codec);
|
||||
ca0132_alt_dsp_volume_put(codec, vnid);
|
||||
mutex_lock(&codec->control_mutex);
|
||||
changed = snd_hda_mixer_amp_volume_put(kcontrol, ucontrol);
|
||||
mutex_unlock(&codec->control_mutex);
|
||||
snd_hda_power_down(codec);
|
||||
|
||||
return changed;
|
||||
}
|
||||
|
|
@ -8664,14 +8638,13 @@ static void ca0132_process_dsp_response(struct hda_codec *codec,
|
|||
struct ca0132_spec *spec = codec->spec;
|
||||
|
||||
codec_dbg(codec, "ca0132_process_dsp_response\n");
|
||||
snd_hda_power_up_pm(codec);
|
||||
CLASS(snd_hda_power_pm, pm)(codec);
|
||||
if (spec->wait_scp) {
|
||||
if (dspio_get_response_data(codec) >= 0)
|
||||
spec->wait_scp = 0;
|
||||
}
|
||||
|
||||
dspio_clear_response_queue(codec);
|
||||
snd_hda_power_down_pm(codec);
|
||||
}
|
||||
|
||||
static void hp_callback(struct hda_codec *codec, struct hda_jack_callback *cb)
|
||||
|
|
@ -9546,7 +9519,7 @@ static int ca0132_init(struct hda_codec *codec)
|
|||
if (ca0132_use_pci_mmio(spec))
|
||||
ca0132_mmio_init(codec);
|
||||
|
||||
snd_hda_power_up_pm(codec);
|
||||
CLASS(snd_hda_power_pm, pm)(codec);
|
||||
|
||||
if (ca0132_quirk(spec) == QUIRK_AE5 || ca0132_quirk(spec) == QUIRK_AE7)
|
||||
ae5_register_set(codec);
|
||||
|
|
@ -9626,8 +9599,6 @@ static int ca0132_init(struct hda_codec *codec)
|
|||
ca0132_pe_switch_set(codec);
|
||||
}
|
||||
|
||||
snd_hda_power_down_pm(codec);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user