Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ALSA: hda/realtek - Remove redundant argument from alc_mux_select()

Browse source 
The argument "force" is always false in the recent code.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2012-12-19 12:24:03 +01:00
parent ab16c6dd79
commit fdf52cab88
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
sound/pci/hda/patch_realtek.c
View file

@ -360,7 +360,7 @@ static void update_shared_mic_hp(struct hda_codec *codec, bool set_as_mic)
/* select the given imux item; either unmute exclusively or select the route */ /* select the given imux item; either unmute exclusively or select the route */
static int alc_mux_select(struct hda_codec *codec, unsigned int adc_idx, static int alc_mux_select(struct hda_codec *codec, unsigned int adc_idx,
unsigned int idx, bool force) unsigned int idx)
{ {
struct alc_spec *spec = codec->spec; struct alc_spec *spec = codec->spec;
const struct hda_input_mux *imux; const struct hda_input_mux *imux;
@ -372,7 +372,7 @@ static int alc_mux_select(struct hda_codec *codec, unsigned int adc_idx,
if (idx >= imux->num_items) if (idx >= imux->num_items)
idx = imux->num_items - 1; idx = imux->num_items - 1;
if (spec->cur_mux[adc_idx] == idx && !force) if (spec->cur_mux[adc_idx] == idx)
return 0; return 0;
path = get_nid_path(codec, spec->imux_pins[spec->cur_mux[adc_idx]], path = get_nid_path(codec, spec->imux_pins[spec->cur_mux[adc_idx]],
@ -407,7 +407,7 @@ static int alc_mux_enum_put(struct snd_kcontrol *kcontrol,
struct hda_codec *codec = snd_kcontrol_chip(kcontrol); struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
unsigned int adc_idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id); unsigned int adc_idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id);
return alc_mux_select(codec, adc_idx, return alc_mux_select(codec, adc_idx,
ucontrol->value.enumerated.item[0], false); ucontrol->value.enumerated.item[0]);
} }
/* /*
@ -624,11 +624,11 @@ static void alc_mic_automute(struct hda_codec *codec, struct hda_jack_tbl *jack)
for (i = spec->am_num_entries - 1; i > 0; i--) { for (i = spec->am_num_entries - 1; i > 0; i--) {
if (snd_hda_jack_detect(codec, spec->am_entry[i].pin)) { if (snd_hda_jack_detect(codec, spec->am_entry[i].pin)) {
alc_mux_select(codec, 0, spec->am_entry[i].idx, false); alc_mux_select(codec, 0, spec->am_entry[i].idx);
return; return;
} }
} }
alc_mux_select(codec, 0, spec->am_entry[0].idx, false); alc_mux_select(codec, 0, spec->am_entry[0].idx);
} }
/* update the master volume per volume-knob's unsol event */ /* update the master volume per volume-knob's unsol event */