linux-leds.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Michał Kępień" <kernel@kempniu.pl>
To: "Richard Purdie" <rpurdie@rpsys.net>,
	"Jacek Anaszewski" <j.anaszewski@samsung.com>,
	"Matthew Garrett" <mjg59@srcf.ucam.org>,
	"Pali Rohár" <pali.rohar@gmail.com>,
	"Darren Hart" <dvhart@infradead.org>,
	"Jaroslav Kysela" <perex@perex.cz>,
	"Takashi Iwai" <tiwai@suse.com>
Cc: Bob Rodgers <Robert_Rodgers@dell.com>,
	Louis Davis <Louis_Davis@dell.com>,
	Jim Dailey <Jim_Dailey@dell.com>,
	Alex Hung <alex.hung@canonical.com>,
	Hui Wang <hui.wang@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 6/7] dell-led: remove code related to mic mute LED
Date: Thu,  8 Dec 2016 13:36:17 +0100	[thread overview]
Message-ID: <20161208123618.28603-7-kernel@kempniu.pl> (raw)
In-Reply-To: <20161208123618.28603-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
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

  parent reply	other threads:[~2016-12-08 12:36 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <CGME20161208123909epcas3p23229f5e0d337e19a27b272211798d364@epcas3p2.samsung.com>
2016-12-08 12:36 ` [PATCH 0/7] Move dell-led to drivers/platform/x86 Michał Kępień
2016-12-08 12:36   ` [PATCH 1/7] dell-led: remove GUID check from dell_micmute_led_set() Michał Kępień
2016-12-09  9:20     ` Pali Rohár
2016-12-15 14:34       ` Michał Kępień
2016-12-08 12:36   ` [PATCH 2/7] dell-led: export dell_micmute_led_set() Michał Kępień
2016-12-08 12:36   ` [PATCH 3/7] ALSA: hda - use dell_micmute_led_set() instead of dell_app_wmi_led_set() Michał Kępień
2016-12-11 10:40     ` Pali Rohár
2016-12-15 14:46       ` Michał Kępień
2016-12-15 15:43         ` Pali Rohár
2016-12-15 19:22           ` Michał Kępień
2017-01-09 13:26             ` Michał Kępień
2017-01-09 14:47               ` Takashi Iwai
2017-01-10  5:28                 ` Michał Kępień
2016-12-08 12:36   ` [PATCH 4/7] dell-led: remove dell_app_wmi_led_set() Michał Kępień
2016-12-11 10:40     ` Pali Rohár
2016-12-14  1:54       ` Andy Shevchenko
2016-12-14  1:57         ` Andy Shevchenko
2016-12-15 14:48           ` Michał Kępień
2016-12-08 12:36   ` [PATCH 5/7] dell-laptop: import dell_micmute_led_set() from drivers/leds/dell-led.c Michał Kępień
2016-12-08 12:36   ` Michał Kępień [this message]
2016-12-08 12:36   ` [PATCH 7/7] dell-led: move driver to drivers/platform/x86/dell-wmi-led.c Michał Kępień
2016-12-14  2:05     ` Andy Shevchenko
2016-12-15 14:54       ` Michał Kępień
2016-12-08 14:26   ` [PATCH 0/7] Move dell-led to drivers/platform/x86 Jacek Anaszewski
2016-12-11 10:45     ` Pali Rohár

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=20161208123618.28603-7-kernel@kempniu.pl \
    --to=kernel@kempniu.pl \
    --cc=Jim_Dailey@dell.com \
    --cc=Louis_Davis@dell.com \
    --cc=Robert_Rodgers@dell.com \
    --cc=alex.hung@canonical.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=dvhart@infradead.org \
    --cc=hui.wang@canonical.com \
    --cc=j.anaszewski@samsung.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-leds@vger.kernel.org \
    --cc=mjg59@srcf.ucam.org \
    --cc=pali.rohar@gmail.com \
    --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).