From patchwork Mon Jan 16 13:22:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?TWljaGHFgiBLxJlwaWXFhA==?= X-Patchwork-Id: 9518727 X-Patchwork-Delegate: andy.shevchenko@gmail.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 647166020B for ; Mon, 16 Jan 2017 13:22:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 49F4D28438 for ; Mon, 16 Jan 2017 13:22:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3E8FA28458; Mon, 16 Jan 2017 13:22:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DBC6228438 for ; Mon, 16 Jan 2017 13:22:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751469AbdAPNWe (ORCPT ); Mon, 16 Jan 2017 08:22:34 -0500 Received: from mail-lf0-f66.google.com ([209.85.215.66]:33720 "EHLO mail-lf0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751422AbdAPNWa (ORCPT ); Mon, 16 Jan 2017 08:22:30 -0500 Received: by mail-lf0-f66.google.com with SMTP id x1so7275774lff.0 for ; Mon, 16 Jan 2017 05:22:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kempniu.pl; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=xalGvFIg0JswieiN8gsRiVaFu8LvcTO1E9clpxvoBpQ=; b=X0DCkUhUNEgH4W8CoWmsVPq5BZJmLzX8OUuSuxFJ94tHDmHniYM4myJxN9DkJQItTT jvNfZr61WrbxrTIiS0RUVPZckvZO08pSoUKuIhYgFJehAOEq8kkJnFESVplO7cSsQDZl Mo/EvzHqctdPmS+0nB1X/AABzDKpAmbiarFOo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=xalGvFIg0JswieiN8gsRiVaFu8LvcTO1E9clpxvoBpQ=; b=CdTcU77rQw69YkNggDciaxlA7WtdzksJ5WoBAai5q66z9tRR9aVUnDKcJqfdQY8bE0 IvmrQ7nYndIbbvm0xrI7Bq5dU4K3YOLqAl6wNHN7W81RdoC1qMmY3oGn/W5dlXt9kWy8 B9Sncq3WFcSJvuBgOm0PHp3nnFAWJ2fkaqsGVNTaKQpXvuPUh1HrajEKHkd4CCClYzml yyCnyF+yQ+BCSoGFX/FRr12Ury142VsmKYXmS8z2qgdRsKYwfwAmnlua6Cc6+/LULwCI xlccRiPUkEIK7W82S/JOmwQAe5rG8I/jjb3fxNnpyyqOIS4UzLAKSVOEbQ5kBt4d9KDj eM1w== X-Gm-Message-State: AIkVDXI6Nzyq626Muo/0hQi05fuRaqAZNcPjMjqUGNgHjGUo4GZfMnXfMcxucNzbk6ufuw== X-Received: by 10.25.217.205 with SMTP id s74mr47846lfi.8.1484572949079; Mon, 16 Jan 2017 05:22:29 -0800 (PST) Received: from ozzy.hq.kempniu.pl ([2001:a10:160:3::3]) by smtp.googlemail.com with ESMTPSA id b62sm7270115lfb.24.2017.01.16.05.22.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Jan 2017 05:22:28 -0800 (PST) From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= To: Richard Purdie , Jacek Anaszewski , Pavel Machek , =?UTF-8?q?Pali=20Roh=C3=A1r?= , Darren Hart , Jaroslav Kysela , Takashi Iwai Cc: Andy Shevchenko , Anthony Wong , 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 Message-Id: <20170116132204.6421-6-kernel@kempniu.pl> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170116132204.6421-1-kernel@kempniu.pl> References: <20170116132204.6421-1-kernel@kempniu.pl> MIME-Version: 1.0 Sender: platform-driver-x86-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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ń Reviewed-by: Pali Rohár --- 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 #include #include -#include -#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);