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 <mario.limonciello@xxxxxxxx>
---
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 <pali.rohar@xxxxxxxxx>
S: Maintained
F: drivers/platform/x86/dell-wmi.c
+DELL WMI SMBIOS DRIVER
+M: Pali Rohár <pali.rohar@xxxxxxxxx>
+M: Mario Limonciello <mario.limonciello@xxxxxxxx>
+S: Maintained
+F: drivers/platform/x86/dell-wmi-smbios.c
+
DELTA ST MEDIA DRIVER
M: Hugues Fruchet <hugues.fruchet@xxxxxx>
L: linux-media@xxxxxxxxxxxxxxx
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 <linux/seq_file.h>
#include <acpi/video.h>
#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 <linux/err.h>
#include <linux/mutex.h>
#include <linux/wmi.h>
-#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 <mjg@xxxxxxxxxx>");
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 <linux/dmi.h>
#include <linux/wmi.h>
#include <acpi/video.h>
-#include "dell-smbios.h"
+#include "dell-wmi-smbios.h"
MODULE_AUTHOR("Matthew Garrett <mjg@xxxxxxxxxx>");
MODULE_AUTHOR("Pali Rohár <pali.rohar@xxxxxxxxx>");
--
2.14.1
