From patchwork Tue Sep 26 18:50:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Limonciello, Mario" X-Patchwork-Id: 9972553 X-Patchwork-Delegate: dvhart@infradead.org 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 C0E2E603FA for ; Tue, 26 Sep 2017 18:52:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B487528F8C for ; Tue, 26 Sep 2017 18:52:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A231728F8A; Tue, 26 Sep 2017 18:52:54 +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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable 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 28B9C28F8C for ; Tue, 26 Sep 2017 18:52:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S967773AbdIZSwK (ORCPT ); Tue, 26 Sep 2017 14:52:10 -0400 Received: from esa6.dell-outbound.iphmx.com ([68.232.149.229]:56583 "EHLO esa6.dell-outbound.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1031665AbdIZSuY (ORCPT ); Tue, 26 Sep 2017 14:50:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=dell.com; i=@dell.com; q=dns/txt; s=smtpout; t=1506451824; x=1537987824; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=PYrmyyNICaS42DaY9WZggg4OpZvrHSndOmgrtzrW9dE=; b=RUnbZGA7ci+/Gjlw3+00wNlDDXrCmSrt4FmFp/VcL/jtwa/j9sg3P/3q 3D0KWD5p5oWcgKbbJlFVJK+0+Dq8UIpXiBkdhGjs+3Crj33QGI5PLT7gy /2+8SfFknJN7xvUjzijekUQ9mEAZXFSR3+O8xbmy27vZJ3EdA9ZaIZwEg 8=; Received: from esa4.dell-outbound2.iphmx.com ([68.232.154.98]) by esa6.dell-outbound.iphmx.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 26 Sep 2017 13:50:23 -0500 Received: from ausc60pc101.us.dell.com ([143.166.85.206]) by esa4.dell-outbound2.iphmx.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 27 Sep 2017 00:50:23 +0600 X-LoopCount0: from 10.208.86.39 X-IronPort-AV: E=Sophos;i="5.42,441,1500958800"; d="scan'208";a="1157572865" X-DLP: DLP_GlobalPCIDSS From: Mario Limonciello To: dvhart@infradead.org, Andy Shevchenko Cc: LKML , platform-driver-x86@vger.kernel.org, quasisec@google.com, pali.rohar@gmail.com, Mario Limonciello Subject: [PATCH v2 09/14] platform/x86: dell-smbios: rename to dell-wmi-smbios Date: Tue, 26 Sep 2017 13:50:07 -0500 Message-Id: <746fb34ff44824808e7892f81247436f80c7ab83.1506451187.git.mario.limonciello@dell.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: MIME-Version: 1.0 In-Reply-To: References: 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 This follows the style of the rest of the platform x86 WMI drivers. Renaming the driver requires adjusting the other drivers using dell-smbios to pick up the newly named includes. While renaming, I noticed that this driver was missing from MAINTAINERS. Add it to that and myself to the list of people maintaing it. Signed-off-by: Mario Limonciello --- MAINTAINERS | 6 ++++++ drivers/platform/x86/Kconfig | 2 +- drivers/platform/x86/Makefile | 2 +- drivers/platform/x86/dell-laptop.c | 2 +- drivers/platform/x86/{dell-smbios.c => dell-wmi-smbios.c} | 12 ++++++------ drivers/platform/x86/{dell-smbios.h => dell-wmi-smbios.h} | 4 ++-- drivers/platform/x86/dell-wmi.c | 2 +- 7 files changed, 18 insertions(+), 12 deletions(-) rename drivers/platform/x86/{dell-smbios.c => dell-wmi-smbios.c} (97%) rename drivers/platform/x86/{dell-smbios.h => dell-wmi-smbios.h} (96%) diff --git a/MAINTAINERS b/MAINTAINERS index 5d8ea24a8ee7..437daa9062e1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4002,6 +4002,12 @@ M: Pali Rohár S: Maintained F: drivers/platform/x86/dell-wmi.c +DELL WMI SMBIOS DRIVER +M: Pali Rohár +M: Mario Limonciello +S: Maintained +F: drivers/platform/x86/dell-wmi-smbios.c + DELTA ST MEDIA DRIVER M: Hugues Fruchet L: linux-media@vger.kernel.org diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig index 81d61c0f4ef8..a70bcd8caa72 100644 --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig @@ -91,7 +91,7 @@ config ASUS_LAPTOP If you have an ACPI-compatible ASUS laptop, say Y or M here. -config DELL_SMBIOS +config DELL_WMI_SMBIOS tristate "Dell WMI SMBIOS calling interface" depends on ACPI_WMI ---help--- diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile index 91cec1751461..b127a3bc1fab 100644 --- a/drivers/platform/x86/Makefile +++ b/drivers/platform/x86/Makefile @@ -11,11 +11,11 @@ obj-$(CONFIG_EEEPC_WMI) += eeepc-wmi.o obj-$(CONFIG_MSI_LAPTOP) += msi-laptop.o obj-$(CONFIG_ACPI_CMPC) += classmate-laptop.o obj-$(CONFIG_COMPAL_LAPTOP) += compal-laptop.o -obj-$(CONFIG_DELL_SMBIOS) += dell-smbios.o obj-$(CONFIG_DELL_LAPTOP) += dell-laptop.o obj-$(CONFIG_DELL_WMI) += dell-wmi.o obj-$(CONFIG_DELL_WMI_AIO) += dell-wmi-aio.o obj-$(CONFIG_DELL_WMI_LED) += dell-wmi-led.o +obj-$(CONFIG_DELL_WMI_SMBIOS) += dell-wmi-smbios.o obj-$(CONFIG_DELL_SMO8800) += dell-smo8800.o obj-$(CONFIG_DELL_RBTN) += dell-rbtn.o obj-$(CONFIG_ACER_WMI) += acer-wmi.o diff --git a/drivers/platform/x86/dell-laptop.c b/drivers/platform/x86/dell-laptop.c index f42159fd2031..bf569ea93e9d 100644 --- a/drivers/platform/x86/dell-laptop.c +++ b/drivers/platform/x86/dell-laptop.c @@ -33,7 +33,7 @@ #include #include #include "dell-rbtn.h" -#include "dell-smbios.h" +#include "dell-wmi-smbios.h" #define BRIGHTNESS_TOKEN 0x7d #define KBD_LED_OFF_TOKEN 0x01E1 diff --git a/drivers/platform/x86/dell-smbios.c b/drivers/platform/x86/dell-wmi-smbios.c similarity index 97% rename from drivers/platform/x86/dell-smbios.c rename to drivers/platform/x86/dell-wmi-smbios.c index 1fbc40791a48..b0812a8fa860 100644 --- a/drivers/platform/x86/dell-smbios.c +++ b/drivers/platform/x86/dell-wmi-smbios.c @@ -21,7 +21,7 @@ #include #include #include -#include "dell-smbios.h" +#include "dell-wmi-smbios.h" #ifdef CONFIG_DCDBAS #include "../../firmware/dcdbas.h" @@ -253,14 +253,14 @@ static const struct wmi_device_id dell_smbios_wmi_id_table[] = { static struct wmi_driver dell_wmi_smbios_driver = { .driver = { - .name = "dell-smbios", + .name = "dell-wmi-smbios", }, .probe = dell_smbios_wmi_probe, .remove = dell_smbios_wmi_remove, .id_table = dell_smbios_wmi_id_table, }; -static int __init dell_smbios_init(void) +static int __init dell_wmi_smbios_init(void) { dmi_walk(find_tokens, NULL); @@ -287,7 +287,7 @@ static int __init dell_smbios_init(void) return 0; } -static void __exit dell_smbios_exit(void) +static void __exit dell_wmi_smbios_exit(void) { kfree(da_tokens); #ifdef CONFIG_DCDBAS @@ -297,8 +297,8 @@ static void __exit dell_smbios_exit(void) wmi_driver_unregister(&dell_wmi_smbios_driver); } -subsys_initcall(dell_smbios_init); -module_exit(dell_smbios_exit); +subsys_initcall(dell_wmi_smbios_init); +module_exit(dell_wmi_smbios_exit); MODULE_AUTHOR("Matthew Garrett "); diff --git a/drivers/platform/x86/dell-smbios.h b/drivers/platform/x86/dell-wmi-smbios.h similarity index 96% rename from drivers/platform/x86/dell-smbios.h rename to drivers/platform/x86/dell-wmi-smbios.h index 2f6fce81ee69..14b7e2ece310 100644 --- a/drivers/platform/x86/dell-smbios.h +++ b/drivers/platform/x86/dell-wmi-smbios.h @@ -14,8 +14,8 @@ * published by the Free Software Foundation. */ -#ifndef _DELL_SMBIOS_H_ -#define _DELL_SMBIOS_H_ +#ifndef _DELL_WMI_SMBIOS_H_ +#define _DELL_WMI_SMBIOS_H_ struct notifier_block; diff --git a/drivers/platform/x86/dell-wmi.c b/drivers/platform/x86/dell-wmi.c index 1fbef560ca67..e8b4d412eabc 100644 --- a/drivers/platform/x86/dell-wmi.c +++ b/drivers/platform/x86/dell-wmi.c @@ -38,7 +38,7 @@ #include #include #include -#include "dell-smbios.h" +#include "dell-wmi-smbios.h" MODULE_AUTHOR("Matthew Garrett "); MODULE_AUTHOR("Pali Rohár ");