p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ALSA: hda - rename dell_led_set_func to dell_micmute_led_set_func 

With dell_app_wmi_led_set() replaced by dell_micmute_led_set(), rename
the function pointer to the latter for consistency.

Signed-off-by: Michał Kępień <kernel@kempniu.pl>
Tested-by: Alex Hung <alex.hung@canonical.com>
Reviewed-by: Pali Rohár <pali.rohar@gmail.com>
Acked-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jacek Anaszewski <jacek.anaszewski@gmail.com>
This commit is contained in:
Michał Kępień 2017-02-17 08:57:49 +01:00 committed by Jacek Anaszewski
parent fa5923cea8
commit 5dba8804e8
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sound/pci/hda/dell_wmi_helper.c
View File

@ -6,7 +6,7 @@
#include <linux/dell-led.h> #include <linux/dell-led.h>
static int dell_led_value; static int dell_led_value;
static int (*dell_led_set_func)(int); static int (*dell_micmute_led_set_func)(int);
static void (*dell_old_cap_hook)(struct hda_codec *, static void (*dell_old_cap_hook)(struct hda_codec *,
struct snd_kcontrol *, struct snd_kcontrol *,
struct snd_ctl_elem_value *); struct snd_ctl_elem_value *);
@ -18,7 +18,7 @@ static void update_dell_wmi_micmute_led(struct hda_codec *codec,
if (dell_old_cap_hook) if (dell_old_cap_hook)
dell_old_cap_hook(codec, kcontrol, ucontrol); dell_old_cap_hook(codec, kcontrol, ucontrol);
if (!ucontrol || !dell_led_set_func) if (!ucontrol || !dell_micmute_led_set_func)
return; return;
if (strcmp("Capture Switch", ucontrol->id.name) == 0 && ucontrol->id.index == 0) { if (strcmp("Capture Switch", ucontrol->id.name) == 0 && ucontrol->id.index == 0) {
/* TODO: How do I verify if it's a mono or stereo here? */ /* TODO: How do I verify if it's a mono or stereo here? */
@ -26,8 +26,8 @@ static void update_dell_wmi_micmute_led(struct hda_codec *codec,
if (val == dell_led_value) if (val == dell_led_value)
return; return;
dell_led_value = val; dell_led_value = val;
if (dell_led_set_func) if (dell_micmute_led_set_func)
dell_led_set_func(dell_led_value); dell_micmute_led_set_func(dell_led_value);
} }
} }
@ -39,15 +39,15 @@ static void alc_fixup_dell_wmi(struct hda_codec *codec,
bool removefunc = false; bool removefunc = false;
if (action == HDA_FIXUP_ACT_PROBE) { if (action == HDA_FIXUP_ACT_PROBE) {
if (!dell_led_set_func) if (!dell_micmute_led_set_func)
dell_led_set_func = symbol_request(dell_micmute_led_set); dell_micmute_led_set_func = symbol_request(dell_micmute_led_set);
if (!dell_led_set_func) { if (!dell_micmute_led_set_func) {
codec_warn(codec, "Failed to find dell wmi symbol dell_micmute_led_set\n"); codec_warn(codec, "Failed to find dell wmi symbol dell_micmute_led_set\n");
return; return;
} }
removefunc = true; removefunc = true;
if (dell_led_set_func(false) >= 0) { if (dell_micmute_led_set_func(false) >= 0) {
dell_led_value = 0; dell_led_value = 0;
if (spec->gen.num_adc_nids > 1 && !spec->gen.dyn_adc_switch) if (spec->gen.num_adc_nids > 1 && !spec->gen.dyn_adc_switch)
codec_dbg(codec, "Skipping micmute LED control due to several ADCs"); codec_dbg(codec, "Skipping micmute LED control due to several ADCs");
@ -60,9 +60,9 @@ static void alc_fixup_dell_wmi(struct hda_codec *codec,
} }
if (dell_led_set_func && (action == HDA_FIXUP_ACT_FREE || removefunc)) { if (dell_micmute_led_set_func && (action == HDA_FIXUP_ACT_FREE || removefunc)) {
symbol_put(dell_micmute_led_set); symbol_put(dell_micmute_led_set);
dell_led_set_func = NULL; dell_micmute_led_set_func = NULL;
dell_old_cap_hook = NULL; dell_old_cap_hook = NULL;
} }
} }