lkml.org 
[lkml]   [2016]   [Dec]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 6/7] dell-led: remove code related to mic mute LED
    Date
    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
    db6d8cc ("dell-led: add mic mute led interface").

    Signed-off-by: Michał Kępień <kernel@kempniu.pl>
    ---
    drivers/leds/Kconfig | 1 -
    drivers/leds/dell-led.c | 25 +++++++------------------
    2 files changed, 7 insertions(+), 19 deletions(-)

    diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
    index c621cbb..f29b869 100644
    --- a/drivers/leds/Kconfig
    +++ b/drivers/leds/Kconfig
    @@ -458,7 +458,6 @@ config LEDS_DELL_NETBOOKS
    tristate "External LED on Dell Business Netbooks"
    depends on LEDS_CLASS
    depends on X86 && ACPI_WMI
    - depends on DELL_SMBIOS
    help
    This adds support for the Latitude 2100 and similar
    notebooks that have an external LED.
    diff --git a/drivers/leds/dell-led.c b/drivers/leds/dell-led.c
    index c9cc36a..e5c5738 100644
    --- a/drivers/leds/dell-led.c
    +++ b/drivers/leds/dell-led.c
    @@ -15,15 +15,12 @@
    #include <linux/leds.h>
    #include <linux/slab.h>
    #include <linux/module.h>
    -#include <linux/dmi.h>
    -#include "../platform/x86/dell-smbios.h"

    MODULE_AUTHOR("Louis Davis/Jim Dailey");
    MODULE_DESCRIPTION("Dell LED Control Driver");
    MODULE_LICENSE("GPL");

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

    /* Error Result Codes: */
    @@ -184,29 +181,21 @@ static int __init dell_led_init(void)
    {
    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;

    - 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)
    {
    - 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);
    --
    2.10.2
    \
     
     \ /
      Last update: 2016-12-08 13:37    [W:2.608 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site