diff options
author | Michał Kępień <kernel@kempniu.pl> | 2017-02-17 02:57:49 -0500 |
---|---|---|
committer | Jacek Anaszewski <jacek.anaszewski@gmail.com> | 2017-03-06 16:07:01 -0500 |
commit | 5dba8804e8c40f03c7bcf4f043089edb232a9084 (patch) | |
tree | 8ebf11f18e570a301a9d012c75ec16c185fb4406 | |
parent | fa5923cea8da3b5d4eb943651922b327b1df673c (diff) |
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>
-rw-r--r-- | sound/pci/hda/dell_wmi_helper.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sound/pci/hda/dell_wmi_helper.c b/sound/pci/hda/dell_wmi_helper.c index e128c8096772..516237ad6ef5 100644 --- a/sound/pci/hda/dell_wmi_helper.c +++ b/sound/pci/hda/dell_wmi_helper.c | |||
@@ -6,7 +6,7 @@ | |||
6 | #include <linux/dell-led.h> | 6 | #include <linux/dell-led.h> |
7 | 7 | ||
8 | static int dell_led_value; | 8 | static int dell_led_value; |
9 | static int (*dell_led_set_func)(int); | 9 | static int (*dell_micmute_led_set_func)(int); |
10 | static void (*dell_old_cap_hook)(struct hda_codec *, | 10 | static void (*dell_old_cap_hook)(struct hda_codec *, |
11 | struct snd_kcontrol *, | 11 | struct snd_kcontrol *, |
12 | struct snd_ctl_elem_value *); | 12 | struct snd_ctl_elem_value *); |
@@ -18,7 +18,7 @@ static void update_dell_wmi_micmute_led(struct hda_codec *codec, | |||
18 | if (dell_old_cap_hook) | 18 | if (dell_old_cap_hook) |
19 | dell_old_cap_hook(codec, kcontrol, ucontrol); | 19 | dell_old_cap_hook(codec, kcontrol, ucontrol); |
20 | 20 | ||
21 | if (!ucontrol || !dell_led_set_func) | 21 | if (!ucontrol || !dell_micmute_led_set_func) |
22 | return; | 22 | return; |
23 | if (strcmp("Capture Switch", ucontrol->id.name) == 0 && ucontrol->id.index == 0) { | 23 | if (strcmp("Capture Switch", ucontrol->id.name) == 0 && ucontrol->id.index == 0) { |
24 | /* TODO: How do I verify if it's a mono or stereo here? */ | 24 | /* 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, | |||
26 | if (val == dell_led_value) | 26 | if (val == dell_led_value) |
27 | return; | 27 | return; |
28 | dell_led_value = val; | 28 | dell_led_value = val; |
29 | if (dell_led_set_func) | 29 | if (dell_micmute_led_set_func) |
30 | dell_led_set_func(dell_led_value); | 30 | dell_micmute_led_set_func(dell_led_value); |
31 | } | 31 | } |
32 | } | 32 | } |
33 | 33 | ||
@@ -39,15 +39,15 @@ static void alc_fixup_dell_wmi(struct hda_codec *codec, | |||
39 | bool removefunc = false; | 39 | bool removefunc = false; |
40 | 40 | ||
41 | if (action == HDA_FIXUP_ACT_PROBE) { | 41 | if (action == HDA_FIXUP_ACT_PROBE) { |
42 | if (!dell_led_set_func) | 42 | if (!dell_micmute_led_set_func) |
43 | dell_led_set_func = symbol_request(dell_micmute_led_set); | 43 | dell_micmute_led_set_func = symbol_request(dell_micmute_led_set); |
44 | if (!dell_led_set_func) { | 44 | if (!dell_micmute_led_set_func) { |
45 | codec_warn(codec, "Failed to find dell wmi symbol dell_micmute_led_set\n"); | 45 | codec_warn(codec, "Failed to find dell wmi symbol dell_micmute_led_set\n"); |
46 | return; | 46 | return; |
47 | } | 47 | } |
48 | 48 | ||
49 | removefunc = true; | 49 | removefunc = true; |
50 | if (dell_led_set_func(false) >= 0) { | 50 | if (dell_micmute_led_set_func(false) >= 0) { |
51 | dell_led_value = 0; | 51 | dell_led_value = 0; |
52 | if (spec->gen.num_adc_nids > 1 && !spec->gen.dyn_adc_switch) | 52 | if (spec->gen.num_adc_nids > 1 && !spec->gen.dyn_adc_switch) |
53 | codec_dbg(codec, "Skipping micmute LED control due to several ADCs"); | 53 | 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, | |||
60 | 60 | ||
61 | } | 61 | } |
62 | 62 | ||
63 | if (dell_led_set_func && (action == HDA_FIXUP_ACT_FREE || removefunc)) { | 63 | if (dell_micmute_led_set_func && (action == HDA_FIXUP_ACT_FREE || removefunc)) { |
64 | symbol_put(dell_micmute_led_set); | 64 | symbol_put(dell_micmute_led_set); |
65 | dell_led_set_func = NULL; | 65 | dell_micmute_led_set_func = NULL; |
66 | dell_old_cap_hook = NULL; | 66 | dell_old_cap_hook = NULL; |
67 | } | 67 | } |
68 | } | 68 | } |