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

ALSA: hda - use dell_micmute_led_set() instead of dell_app_wmi_led_set() 



The dell_app_wmi_led_set() method introduced in commit db6d8cc0
("dell-led: add mic mute led interface") was implemented as an easily
extensible entry point for other modules to set the state of various
LEDs.  However, almost three years later it is still only used to
control the mic mute LED, so it will be replaced with direct calls to
dell_micmute_led_set().

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 6dbea853

drivers/leds/dell-led.c

+2 −18
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ MODULE_ALIAS("wmi:" DELL_LED_BIOS_GUID); 
#define GLOBAL_MIC_MUTE_ENABLE	0x364

#define GLOBAL_MIC_MUTE_DISABLE	0x365



static int dell_micmute_led_set(int state)

int dell_micmute_led_set(int state)

{

	struct calling_interface_buffer *buffer;

	struct calling_interface_token *token;
@@ -69,23 +69,7 @@ static int dell_micmute_led_set(int state) 


	return state;

}



int dell_app_wmi_led_set(int whichled, int on)

{

	int state = 0;



	switch (whichled) {

	case DELL_LED_MICMUTE:

		state = dell_micmute_led_set(on);

		break;

	default:

		pr_warn("led type %x is not supported\n", whichled);

		break;

	}



	return state;

}

EXPORT_SYMBOL_GPL(dell_app_wmi_led_set);

EXPORT_SYMBOL_GPL(dell_micmute_led_set);



struct bios_args {

	unsigned char length;

include/linux/dell-led.h

+1 −5
Original line number Diff line number Diff line 
#ifndef __DELL_LED_H__

#define __DELL_LED_H__



enum {

	DELL_LED_MICMUTE,

};



int dell_app_wmi_led_set(int whichled, int on);

int dell_micmute_led_set(int on);



#endif

sound/pci/hda/dell_wmi_helper.c

+6 −6
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, int);

static int (*dell_led_set_func)(int);

static void (*dell_old_cap_hook)(struct hda_codec *,

			         struct snd_kcontrol *,

				 struct snd_ctl_elem_value *);
@@ -27,7 +27,7 @@ static void update_dell_wmi_micmute_led(struct hda_codec *codec, 
			return;

		dell_led_value = val;

		if (dell_led_set_func)

			dell_led_set_func(DELL_LED_MICMUTE, dell_led_value);

			dell_led_set_func(dell_led_value);

	}

}
@@ -40,14 +40,14 @@ static void alc_fixup_dell_wmi(struct hda_codec *codec, 


	if (action == HDA_FIXUP_ACT_PROBE) {

		if (!dell_led_set_func)

			dell_led_set_func = symbol_request(dell_app_wmi_led_set);

			dell_led_set_func = symbol_request(dell_micmute_led_set);

		if (!dell_led_set_func) {

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

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

			return;

		}



		removefunc = true;

		if (dell_led_set_func(DELL_LED_MICMUTE, false) >= 0) {

		if (dell_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");
@@ -61,7 +61,7 @@ static void alc_fixup_dell_wmi(struct hda_codec *codec, 
	}



	if (dell_led_set_func && (action == HDA_FIXUP_ACT_FREE || removefunc)) {

		symbol_put(dell_app_wmi_led_set);

		symbol_put(dell_micmute_led_set);

		dell_led_set_func = NULL;

		dell_old_cap_hook = NULL;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE