From: "Michał Kępień" <kernel@kempniu.pl>
To: "Richard Purdie" <rpurdie@rpsys.net>,
"Jacek Anaszewski" <jacek.anaszewski@gmail.com>,
"Pavel Machek" <pavel@ucw.cz>,
"Pali Rohár" <pali.rohar@gmail.com>,
"Darren Hart" <dvhart@infradead.org>,
"Jaroslav Kysela" <perex@perex.cz>,
"Takashi Iwai" <tiwai@suse.com>
Cc: Andy Shevchenko <andy.shevchenko@gmail.com>,
Anthony Wong <anthony.wong@canonical.com>,
linux-leds@vger.kernel.org, platform-driver-x86@vger.kernel.org,
alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org
Subject: [PATCH v2 5/6] dell-led: remove code related to mic mute LED
Date: Mon, 16 Jan 2017 14:22:03 +0100 [thread overview]
Message-ID: <20170116132204.6421-6-kernel@kempniu.pl> (raw)
In-Reply-To: <20170116132204.6421-1-kernel@kempniu.pl>
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>
---
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 c621cbbb5768..f29b8698ca88 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 c9cc36a7c890..e5c57389efd6 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.11.0
next prev parent reply other threads:[~2017-01-16 13:22 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-16 13:21 [PATCH v2 0/6] Move dell-led to drivers/platform/x86 Michał Kępień
2017-01-16 13:21 ` [PATCH v2 1/6] dell-led: remove GUID check from dell_micmute_led_set() Michał Kępień
2017-01-16 13:22 ` [PATCH v2 2/6] ALSA: hda - use dell_micmute_led_set() instead of dell_app_wmi_led_set() Michał Kępień
2017-01-16 13:22 ` [PATCH v2 3/6] ALSA: hda - rename dell_led_set_func to dell_micmute_led_set_func Michał Kępień
2017-01-17 11:12 ` Pali Rohár
2017-01-17 21:20 ` Jacek Anaszewski
2017-01-16 13:22 ` [PATCH v2 4/6] platform/x86: dell-laptop: import dell_micmute_led_set() from drivers/leds/dell-led.c Michał Kępień
2017-01-17 11:23 ` Pali Rohár
2017-01-18 19:12 ` Andy Shevchenko
2017-01-16 13:22 ` Michał Kępień [this message]
2017-01-17 11:24 ` [PATCH v2 5/6] dell-led: remove code related to mic mute LED Pali Rohár
2017-01-16 13:22 ` [PATCH v2 6/6] dell-led: move driver to drivers/platform/x86/dell-wmi-led.c Michał Kępień
2017-01-16 20:49 ` Jacek Anaszewski
2017-01-17 11:08 ` Pavel Machek
2017-01-17 11:28 ` Pali Rohár
2017-01-18 19:08 ` Andy Shevchenko
2017-01-17 7:17 ` [PATCH v2 6+/6] platform/x86: dell-wmi-led: fix coding style issues Michał Kępień
2017-01-17 8:21 ` Joe Perches
2017-01-17 9:19 ` Michał Kępień
2017-01-17 21:20 ` Jacek Anaszewski
2017-01-17 11:08 ` Pavel Machek
2017-01-18 19:06 ` Andy Shevchenko
2017-01-17 21:20 ` [PATCH v2 0/6] Move dell-led to drivers/platform/x86 Jacek Anaszewski
2017-02-13 11:26 ` Michał Kępień
2017-02-15 11:56 ` Alex Hung
2017-02-15 13:54 ` Michał Kępień
2017-02-15 14:31 ` Alex Hung
2017-02-15 15:12 ` Pali Rohár
2017-02-16 9:33 ` Michał Kępień
2017-02-16 9:27 ` Michał Kępień
2017-02-16 10:35 ` Alex Hung
2017-02-16 11:32 ` Michał Kępień
2017-02-16 11:38 ` Alex Hung
2017-02-16 11:41 ` Andy Shevchenko
2017-02-16 12:01 ` Michał Kępień
2017-02-16 13:11 ` Andy Shevchenko
2017-02-16 22:11 ` Jacek Anaszewski
2017-02-15 20:28 ` Takashi Iwai
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170116132204.6421-6-kernel@kempniu.pl \
--to=kernel@kempniu.pl \
--cc=alsa-devel@alsa-project.org \
--cc=andy.shevchenko@gmail.com \
--cc=anthony.wong@canonical.com \
--cc=dvhart@infradead.org \
--cc=jacek.anaszewski@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-leds@vger.kernel.org \
--cc=pali.rohar@gmail.com \
--cc=pavel@ucw.cz \
--cc=perex@perex.cz \
--cc=platform-driver-x86@vger.kernel.org \
--cc=rpurdie@rpsys.net \
--cc=tiwai@suse.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).