소스 검색

dell-led: remove code related to mic mute LED

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 db6d8cc00773 ("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>
Michał Kępień 8 년 전
부모
커밋
e5aa482a8a
2개의 변경된 파일7개의 추가작업 그리고 19개의 파일을 삭제
  1. 0 1
      drivers/leds/Kconfig
  2. 7 18
      drivers/leds/dell-led.c

+ 0 - 1
drivers/leds/Kconfig

@@ -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.

+ 7 - 18
drivers/leds/dell-led.c

@@ -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();
-		if (error != 0)
-			return -ENODEV;
-
-		error = led_classdev_register(NULL, &dell_led);
-	}
+	error = led_off();
+	if (error != 0)
+		return -ENODEV;
 
 
-	return error;
+	return led_classdev_register(NULL, &dell_led);
 }
 }
 
 
 static void __exit dell_led_exit(void)
 static void __exit dell_led_exit(void)
 {
 {
-	int error = 0;
+	led_classdev_unregister(&dell_led);
 
 
-	if (wmi_has_guid(DELL_LED_BIOS_GUID)) {
-		error = led_off();
-		if (error == 0)
-			led_classdev_unregister(&dell_led);
-	}
+	led_off();
 }
 }
 
 
 module_init(dell_led_init);
 module_init(dell_led_init);