AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2025-03-04 16:31:33 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

dell-led: remove code related to mic mute LED

Browse Source 
With dell_micmute_led_set() moved to drivers/platform/x86/dell-laptop.c,
all remnants of the mic mute LED handling code can be removed from
drivers/leds/dell-led.c, restoring it back to the state it was in before
commit db6d8cc007 ("dell-led: add mic mute led interface").

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>
Signed-off-by: Jacek Anaszewski <jacek.anaszewski@gmail.com>
This commit is contained in:
Michał Kępień 2017-02-17 08:57:51 +01:00 committed by Jacek Anaszewski
parent 44319ab7e0
commit e5aa482a8a
2 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/leds/Kconfig
View File

@ -467,7 +467,6 @@ config LEDS_DELL_NETBOOKS
tristate "External LED on Dell Business Netbooks" tristate "External LED on Dell Business Netbooks"
depends on LEDS_CLASS depends on LEDS_CLASS
depends on X86 && ACPI_WMI depends on X86 && ACPI_WMI
depends on DELL_SMBIOS
help help
This adds support for the Latitude 2100 and similar This adds support for the Latitude 2100 and similar
notebooks that have an external LED. notebooks that have an external LED.

19
drivers/leds/dell-led.c
View File

@ -15,15 +15,12 @@
#include <linux/leds.h> #include <linux/leds.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/dmi.h>
#include "../platform/x86/dell-smbios.h"
MODULE_AUTHOR("Louis Davis/Jim Dailey"); MODULE_AUTHOR("Louis Davis/Jim Dailey");
MODULE_DESCRIPTION("Dell LED Control Driver"); MODULE_DESCRIPTION("Dell LED Control Driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
#define DELL_LED_BIOS_GUID "F6E4FE6E-909D-47cb-8BAB-C9F6F2F8D396" #define DELL_LED_BIOS_GUID "F6E4FE6E-909D-47cb-8BAB-C9F6F2F8D396"
#define DELL_APP_GUID "A80593CE-A997-11DA-B012-B622A1EF5492"
MODULE_ALIAS("wmi:" DELL_LED_BIOS_GUID); MODULE_ALIAS("wmi:" DELL_LED_BIOS_GUID);
/* Error Result Codes: */ /* Error Result Codes: */
@ -184,29 +181,21 @@ static int __init dell_led_init(void)
{ {
int error = 0; int error = 0;
if (!wmi_has_guid(DELL_LED_BIOS_GUID) && !wmi_has_guid(DELL_APP_GUID)) if (!wmi_has_guid(DELL_LED_BIOS_GUID))
return -ENODEV; return -ENODEV;
if (wmi_has_guid(DELL_LED_BIOS_GUID)) {
error = led_off(); error = led_off();
if (error != 0) if (error != 0)
return -ENODEV; return -ENODEV;
error = led_classdev_register(NULL, &dell_led); return led_classdev_register(NULL, &dell_led);
}
return error;
} }
static void __exit dell_led_exit(void) static void __exit dell_led_exit(void)
{ {
int error = 0;
if (wmi_has_guid(DELL_LED_BIOS_GUID)) {
error = led_off();
if (error == 0)
led_classdev_unregister(&dell_led); led_classdev_unregister(&dell_led);
}
led_off();
} }
module_init(dell_led_init); module_init(dell_led_init);