Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5dba8804 authored by Michał Kępień's avatar Michał Kępień Committed by Jacek Anaszewski
Browse files

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: default avatarMichał Kępień <kernel@kempniu.pl>
Tested-by: default avatarAlex Hung <alex.hung@canonical.com>
Reviewed-by: default avatarPali Rohár <pali.rohar@gmail.com>
Acked-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJacek Anaszewski <jacek.anaszewski@gmail.com>
parent fa5923ce

sound/pci/hda/dell_wmi_helper.c

+10 −10
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
#include <linux/dell-led.h>



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 *,

			         struct snd_kcontrol *,

				 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)

		dell_old_cap_hook(codec, kcontrol, ucontrol);



	if (!ucontrol || !dell_led_set_func)

	if (!ucontrol || !dell_micmute_led_set_func)

		return;

	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? */
@@ -26,8 +26,8 @@ static void update_dell_wmi_micmute_led(struct hda_codec *codec, 
		if (val == dell_led_value)

			return;

		dell_led_value = val;

		if (dell_led_set_func)

			dell_led_set_func(dell_led_value);

		if (dell_micmute_led_set_func)

			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;



	if (action == HDA_FIXUP_ACT_PROBE) {

		if (!dell_led_set_func)

			dell_led_set_func = symbol_request(dell_micmute_led_set);

		if (!dell_led_set_func) {

		if (!dell_micmute_led_set_func)

			dell_micmute_led_set_func = symbol_request(dell_micmute_led_set);

		if (!dell_micmute_led_set_func) {

			codec_warn(codec, "Failed to find dell wmi symbol dell_micmute_led_set\n");

			return;

		}



		removefunc = true;

		if (dell_led_set_func(false) >= 0) {

		if (dell_micmute_led_set_func(false) >= 0) {

			dell_led_value = 0;

			if (spec->gen.num_adc_nids > 1 && !spec->gen.dyn_adc_switch)

				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);

		dell_led_set_func = NULL;

		dell_micmute_led_set_func = NULL;

		dell_old_cap_hook = NULL;

	}

}