| Message ID | 746fb34ff44824808e7892f81247436f80c7ab83.1506451187.git.mario.limonciello@dell.com (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Delegated to: | Darren Hart |
| Headers | show |
On Tuesday 26 September 2017 20:50:07 Mario Limonciello wrote: > 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@dell.com> Now when driver supports both old and new WMI call interface, I think that renaming is not needed...
> -----Original Message----- > From: Pali Rohár [mailto:pali.rohar@gmail.com] > Sent: Tuesday, September 26, 2017 4:06 PM > To: Limonciello, Mario <Mario_Limonciello@Dell.com> > Cc: dvhart@infradead.org; Andy Shevchenko <andy.shevchenko@gmail.com>; > LKML <linux-kernel@vger.kernel.org>; platform-driver-x86@vger.kernel.org; > quasisec@google.com > Subject: Re: [PATCH v2 09/14] platform/x86: dell-smbios: rename to dell-wmi- > smbios > > On Tuesday 26 September 2017 20:50:07 Mario Limonciello wrote: > > 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@dell.com> > > Now when driver supports both old and new WMI call interface, I think > that renaming is not needed... > So all other drivers that use WMI have "WMI" in the name, this would be breaking previously set precedence. Daren, Andy, what would you like me to do?
On Tue, Sep 26, 2017 at 08:18:54PM +0000, Mario.Limonciello@dell.com wrote: > > -----Original Message----- > > From: Pali Rohár [mailto:pali.rohar@gmail.com] > > Sent: Tuesday, September 26, 2017 4:06 PM > > To: Limonciello, Mario <Mario_Limonciello@Dell.com> > > Cc: dvhart@infradead.org; Andy Shevchenko <andy.shevchenko@gmail.com>; > > LKML <linux-kernel@vger.kernel.org>; platform-driver-x86@vger.kernel.org; > > quasisec@google.com > > Subject: Re: [PATCH v2 09/14] platform/x86: dell-smbios: rename to dell-wmi- > > smbios > > > > On Tuesday 26 September 2017 20:50:07 Mario Limonciello wrote: > > > 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@dell.com> > > > > Now when driver supports both old and new WMI call interface, I think > > that renaming is not needed... > > > > So all other drivers that use WMI have "WMI" in the name, this would be > breaking previously set precedence. Daren, Andy, what would you like > me to do? I'm leaning toward Pali's point of view here. In fact, I think the driver name should reflect WHAT it does as opposed to HOW it does it. vendor-hotkeys is a much better name than vendor-wmi. We have a lot of drivers that are not nicely granular and use more generic terms like -acpi or -laptop, but those shouldn't be the first choice in my opinion. Now, is SMBIOS any better than WMI? :-) Not really, but it is at least as good as, and less change makes it the winner IMO.
Hi Mario,
[auto build test WARNING on platform-drivers-x86/for-next]
[also build test WARNING on v4.14-rc2 next-20170928]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
url: https://github.com/0day-ci/linux/commits/Mario-Limonciello/Introduce-support-for-Dell-SMBIOS-over-WMI/20170929-221513
base: git://git.infradead.org/users/dvhart/linux-platform-drivers-x86.git for-next
config: x86_64-randconfig-x001-201739 (attached as .config)
compiler: gcc-6 (Debian 6.2.0-3) 6.2.0 20160901
reproduce:
# save the attached .config to linux build tree
make ARCH=x86_64
All warnings (new ones prefixed by >>):
______f = { \
^
include/linux/compiler.h:154:23: note: in expansion of macro '__trace_if'
#define if(cond, ...) __trace_if( (cond , ## __VA_ARGS__) )
^~~~~~~~~~
include/linux/string.h:293:3: note: in expansion of macro 'if'
if (len >= p_size)
^~
include/linux/compiler.h:162:4: warning: '______f' is static but declared in inline function 'strlcpy' which is not static
______f = { \
^
include/linux/compiler.h:154:23: note: in expansion of macro '__trace_if'
#define if(cond, ...) __trace_if( (cond , ## __VA_ARGS__) )
^~~~~~~~~~
include/linux/string.h:291:3: note: in expansion of macro 'if'
if (__builtin_constant_p(len) && len >= p_size)
^~
include/linux/compiler.h:162:4: warning: '______f' is static but declared in inline function 'strlcpy' which is not static
______f = { \
^
include/linux/compiler.h:154:23: note: in expansion of macro '__trace_if'
#define if(cond, ...) __trace_if( (cond , ## __VA_ARGS__) )
^~~~~~~~~~
include/linux/string.h:289:2: note: in expansion of macro 'if'
if (size) {
^~
include/linux/compiler.h:162:4: warning: '______f' is static but declared in inline function 'strlcpy' which is not static
______f = { \
^
include/linux/compiler.h:154:23: note: in expansion of macro '__trace_if'
#define if(cond, ...) __trace_if( (cond , ## __VA_ARGS__) )
^~~~~~~~~~
include/linux/string.h:286:2: note: in expansion of macro 'if'
if (p_size == (size_t)-1 && q_size == (size_t)-1)
^~
include/linux/compiler.h:162:4: warning: '______f' is static but declared in inline function 'strnlen' which is not static
______f = { \
^
include/linux/compiler.h:154:23: note: in expansion of macro '__trace_if'
#define if(cond, ...) __trace_if( (cond , ## __VA_ARGS__) )
^~~~~~~~~~
include/linux/string.h:274:2: note: in expansion of macro 'if'
if (p_size <= ret && maxlen != ret)
^~
include/linux/compiler.h:162:4: warning: '______f' is static but declared in inline function 'strlen' which is not static
______f = { \
^
include/linux/compiler.h:154:23: note: in expansion of macro '__trace_if'
#define if(cond, ...) __trace_if( (cond , ## __VA_ARGS__) )
^~~~~~~~~~
include/linux/string.h:264:2: note: in expansion of macro 'if'
if (p_size <= ret)
^~
include/linux/compiler.h:162:4: warning: '______f' is static but declared in inline function 'strlen' which is not static
______f = { \
^
include/linux/compiler.h:154:23: note: in expansion of macro '__trace_if'
#define if(cond, ...) __trace_if( (cond , ## __VA_ARGS__) )
^~~~~~~~~~
include/linux/string.h:261:2: note: in expansion of macro 'if'
if (p_size == (size_t)-1)
^~
include/linux/compiler.h:162:4: warning: '______f' is static but declared in inline function 'strcat' which is not static
______f = { \
^
include/linux/compiler.h:154:23: note: in expansion of macro '__trace_if'
#define if(cond, ...) __trace_if( (cond , ## __VA_ARGS__) )
^~~~~~~~~~
include/linux/string.h:252:2: note: in expansion of macro 'if'
if (strlcat(p, q, p_size) >= p_size)
^~
include/linux/compiler.h:162:4: warning: '______f' is static but declared in inline function 'strcat' which is not static
______f = { \
^
include/linux/compiler.h:154:23: note: in expansion of macro '__trace_if'
#define if(cond, ...) __trace_if( (cond , ## __VA_ARGS__) )
^~~~~~~~~~
include/linux/string.h:250:2: note: in expansion of macro 'if'
if (p_size == (size_t)-1)
^~
include/linux/compiler.h:162:4: warning: '______f' is static but declared in inline function 'strncpy' which is not static
______f = { \
^
include/linux/compiler.h:154:23: note: in expansion of macro '__trace_if'
#define if(cond, ...) __trace_if( (cond , ## __VA_ARGS__) )
^~~~~~~~~~
include/linux/string.h:242:2: note: in expansion of macro 'if'
if (p_size < size)
^~
include/linux/compiler.h:162:4: warning: '______f' is static but declared in inline function 'strncpy' which is not static
______f = { \
^
include/linux/compiler.h:154:23: note: in expansion of macro '__trace_if'
#define if(cond, ...) __trace_if( (cond , ## __VA_ARGS__) )
^~~~~~~~~~
include/linux/string.h:240:2: note: in expansion of macro 'if'
if (__builtin_constant_p(size) && p_size < size)
^~
In file included from drivers/platform//x86/dell-wmi-smbios.c:23:0:
drivers/platform//x86/dell-wmi-smbios.c: In function 'dell_wmi_smbios_init':
>> include/linux/wmi.h:53:37: warning: ignoring return value of '__wmi_driver_register', declared with attribute warn_unused_result [-Wunused-result]
#define wmi_driver_register(driver) __wmi_driver_register((driver), THIS_MODULE)
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>> drivers/platform//x86/dell-wmi-smbios.c:281:2: note: in expansion of macro 'wmi_driver_register'
wmi_driver_register(&dell_wmi_smbios_driver);
^~~~~~~~~~~~~~~~~~~
--
______f = { \
^
include/linux/compiler.h:154:23: note: in expansion of macro '__trace_if'
#define if(cond, ...) __trace_if( (cond , ## __VA_ARGS__) )
^~~~~~~~~~
include/linux/string.h:293:3: note: in expansion of macro 'if'
if (len >= p_size)
^~
include/linux/compiler.h:162:4: warning: '______f' is static but declared in inline function 'strlcpy' which is not static
______f = { \
^
include/linux/compiler.h:154:23: note: in expansion of macro '__trace_if'
#define if(cond, ...) __trace_if( (cond , ## __VA_ARGS__) )
^~~~~~~~~~
include/linux/string.h:291:3: note: in expansion of macro 'if'
if (__builtin_constant_p(len) && len >= p_size)
^~
include/linux/compiler.h:162:4: warning: '______f' is static but declared in inline function 'strlcpy' which is not static
______f = { \
^
include/linux/compiler.h:154:23: note: in expansion of macro '__trace_if'
#define if(cond, ...) __trace_if( (cond , ## __VA_ARGS__) )
^~~~~~~~~~
include/linux/string.h:289:2: note: in expansion of macro 'if'
if (size) {
^~
include/linux/compiler.h:162:4: warning: '______f' is static but declared in inline function 'strlcpy' which is not static
______f = { \
^
include/linux/compiler.h:154:23: note: in expansion of macro '__trace_if'
#define if(cond, ...) __trace_if( (cond , ## __VA_ARGS__) )
^~~~~~~~~~
include/linux/string.h:286:2: note: in expansion of macro 'if'
if (p_size == (size_t)-1 && q_size == (size_t)-1)
^~
include/linux/compiler.h:162:4: warning: '______f' is static but declared in inline function 'strnlen' which is not static
______f = { \
^
include/linux/compiler.h:154:23: note: in expansion of macro '__trace_if'
#define if(cond, ...) __trace_if( (cond , ## __VA_ARGS__) )
^~~~~~~~~~
include/linux/string.h:274:2: note: in expansion of macro 'if'
if (p_size <= ret && maxlen != ret)
^~
include/linux/compiler.h:162:4: warning: '______f' is static but declared in inline function 'strlen' which is not static
______f = { \
^
include/linux/compiler.h:154:23: note: in expansion of macro '__trace_if'
#define if(cond, ...) __trace_if( (cond , ## __VA_ARGS__) )
^~~~~~~~~~
include/linux/string.h:264:2: note: in expansion of macro 'if'
if (p_size <= ret)
^~
include/linux/compiler.h:162:4: warning: '______f' is static but declared in inline function 'strlen' which is not static
______f = { \
^
include/linux/compiler.h:154:23: note: in expansion of macro '__trace_if'
#define if(cond, ...) __trace_if( (cond , ## __VA_ARGS__) )
^~~~~~~~~~
include/linux/string.h:261:2: note: in expansion of macro 'if'
if (p_size == (size_t)-1)
^~
include/linux/compiler.h:162:4: warning: '______f' is static but declared in inline function 'strcat' which is not static
______f = { \
^
include/linux/compiler.h:154:23: note: in expansion of macro '__trace_if'
#define if(cond, ...) __trace_if( (cond , ## __VA_ARGS__) )
^~~~~~~~~~
include/linux/string.h:252:2: note: in expansion of macro 'if'
if (strlcat(p, q, p_size) >= p_size)
^~
include/linux/compiler.h:162:4: warning: '______f' is static but declared in inline function 'strcat' which is not static
______f = { \
^
include/linux/compiler.h:154:23: note: in expansion of macro '__trace_if'
#define if(cond, ...) __trace_if( (cond , ## __VA_ARGS__) )
^~~~~~~~~~
include/linux/string.h:250:2: note: in expansion of macro 'if'
if (p_size == (size_t)-1)
^~
include/linux/compiler.h:162:4: warning: '______f' is static but declared in inline function 'strncpy' which is not static
______f = { \
^
include/linux/compiler.h:154:23: note: in expansion of macro '__trace_if'
#define if(cond, ...) __trace_if( (cond , ## __VA_ARGS__) )
^~~~~~~~~~
include/linux/string.h:242:2: note: in expansion of macro 'if'
if (p_size < size)
^~
include/linux/compiler.h:162:4: warning: '______f' is static but declared in inline function 'strncpy' which is not static
______f = { \
^
include/linux/compiler.h:154:23: note: in expansion of macro '__trace_if'
#define if(cond, ...) __trace_if( (cond , ## __VA_ARGS__) )
^~~~~~~~~~
include/linux/string.h:240:2: note: in expansion of macro 'if'
if (__builtin_constant_p(size) && p_size < size)
^~
In file included from drivers/platform/x86/dell-wmi-smbios.c:23:0:
drivers/platform/x86/dell-wmi-smbios.c: In function 'dell_wmi_smbios_init':
>> include/linux/wmi.h:53:37: warning: ignoring return value of '__wmi_driver_register', declared with attribute warn_unused_result [-Wunused-result]
#define wmi_driver_register(driver) __wmi_driver_register((driver), THIS_MODULE)
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/platform/x86/dell-wmi-smbios.c:281:2: note: in expansion of macro 'wmi_driver_register'
wmi_driver_register(&dell_wmi_smbios_driver);
^~~~~~~~~~~~~~~~~~~
vim +/__wmi_driver_register +53 include/linux/wmi.h
844af950 Andy Lutomirski 2015-11-24 49
844af950 Andy Lutomirski 2015-11-24 50 extern int __must_check __wmi_driver_register(struct wmi_driver *driver,
844af950 Andy Lutomirski 2015-11-24 51 struct module *owner);
844af950 Andy Lutomirski 2015-11-24 52 extern void wmi_driver_unregister(struct wmi_driver *driver);
844af950 Andy Lutomirski 2015-11-24 @53 #define wmi_driver_register(driver) __wmi_driver_register((driver), THIS_MODULE)
844af950 Andy Lutomirski 2015-11-24 54
:::::: The code at line 53 was first introduced by commit
:::::: 844af950da946cfab227a04b950614da04cb6275 platform/x86: wmi: Turn WMI into a bus driver
:::::: TO: Andy Lutomirski <luto@kernel.org>
:::::: CC: Darren Hart (VMware) <dvhart@infradead.org>
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
Hi Mario,
[auto build test ERROR on platform-drivers-x86/for-next]
[also build test ERROR on v4.14-rc2 next-20170929]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
url: https://github.com/0day-ci/linux/commits/Mario-Limonciello/Introduce-support-for-Dell-SMBIOS-over-WMI/20170929-221513
base: git://git.infradead.org/users/dvhart/linux-platform-drivers-x86.git for-next
config: i386-randconfig-i0-201739 (attached as .config)
compiler: gcc-4.8 (Debian 4.8.4-1) 4.8.4
reproduce:
# save the attached .config to linux build tree
make ARCH=i386
All errors (new ones prefixed by >>):
drivers/platform/x86/dell-laptop.o: In function `kbd_get_state':
>> dell-laptop.c:(.text+0xa1): undefined reference to `dell_smbios_get_buffer'
>> dell-laptop.c:(.text+0xb9): undefined reference to `dell_smbios_send_request'
>> dell-laptop.c:(.text+0xe0): undefined reference to `dell_smbios_error'
>> dell-laptop.c:(.text+0x178): undefined reference to `dell_smbios_release_buffer'
drivers/platform/x86/dell-laptop.o: In function `kbd_set_state':
dell-laptop.c:(.text+0x19d): undefined reference to `dell_smbios_get_buffer'
dell-laptop.c:(.text+0x22c): undefined reference to `dell_smbios_send_request'
dell-laptop.c:(.text+0x234): undefined reference to `dell_smbios_release_buffer'
dell-laptop.c:(.text+0x23b): undefined reference to `dell_smbios_error'
drivers/platform/x86/dell-laptop.o: In function `dell_send_intensity':
>> dell-laptop.c:(.text+0xa53): undefined reference to `dell_smbios_find_token'
dell-laptop.c:(.text+0xa77): undefined reference to `dell_smbios_get_buffer'
dell-laptop.c:(.text+0xab6): undefined reference to `dell_smbios_send_request'
dell-laptop.c:(.text+0xacb): undefined reference to `dell_smbios_send_request'
dell-laptop.c:(.text+0xad3): undefined reference to `dell_smbios_error'
dell-laptop.c:(.text+0xada): undefined reference to `dell_smbios_release_buffer'
drivers/platform/x86/dell-laptop.o: In function `dell_get_intensity':
dell-laptop.c:(.text+0xb10): undefined reference to `dell_smbios_find_token'
dell-laptop.c:(.text+0xb38): undefined reference to `dell_smbios_get_buffer'
dell-laptop.c:(.text+0xb6f): undefined reference to `dell_smbios_send_request'
dell-laptop.c:(.text+0xb80): undefined reference to `dell_smbios_send_request'
dell-laptop.c:(.text+0xba8): undefined reference to `dell_smbios_error'
dell-laptop.c:(.text+0xbb4): undefined reference to `dell_smbios_release_buffer'
drivers/platform/x86/dell-laptop.o: In function `dell_debugfs_show':
dell-laptop.c:(.text+0xd71): undefined reference to `dell_smbios_get_buffer'
dell-laptop.c:(.text+0xd82): undefined reference to `dell_smbios_send_request'
>> dell-laptop.c:(.text+0xd90): undefined reference to `dell_smbios_clear_buffer'
dell-laptop.c:(.text+0xda6): undefined reference to `dell_smbios_send_request'
dell-laptop.c:(.text+0xdb4): undefined reference to `dell_smbios_release_buffer'
drivers/platform/x86/dell-laptop.o: In function `kbd_led_level_set':
dell-laptop.c:(.text+0x1433): undefined reference to `dell_smbios_find_token'
dell-laptop.c:(.text+0x1457): undefined reference to `dell_smbios_get_buffer'
dell-laptop.c:(.text+0x1473): undefined reference to `dell_smbios_send_request'
dell-laptop.c:(.text+0x147b): undefined reference to `dell_smbios_release_buffer'
dell-laptop.c:(.text+0x1482): undefined reference to `dell_smbios_error'
drivers/platform/x86/dell-laptop.o: In function `kbd_led_level_get':
dell-laptop.c:(.text+0x1c50): undefined reference to `dell_smbios_find_token'
dell-laptop.c:(.text+0x1c78): undefined reference to `dell_smbios_get_buffer'
dell-laptop.c:(.text+0x1c8d): undefined reference to `dell_smbios_send_request'
dell-laptop.c:(.text+0x1c9e): undefined reference to `dell_smbios_release_buffer'
dell-laptop.c:(.text+0x1cc2): undefined reference to `dell_smbios_error'
drivers/platform/x86/dell-laptop.o: In function `dell_rfkill_update_sw_state.isra.8':
dell-laptop.c:(.text+0x1fc8): undefined reference to `dell_smbios_clear_buffer'
dell-laptop.c:(.text+0x1fe2): undefined reference to `dell_smbios_send_request'
drivers/platform/x86/dell-laptop.o: In function `dell_update_rfkill':
dell-laptop.c:(.text+0x1ffc): undefined reference to `dell_smbios_get_buffer'
dell-laptop.c:(.text+0x200d): undefined reference to `dell_smbios_send_request'
dell-laptop.c:(.text+0x2039): undefined reference to `dell_smbios_clear_buffer'
dell-laptop.c:(.text+0x204f): undefined reference to `dell_smbios_send_request'
dell-laptop.c:(.text+0x2159): undefined reference to `dell_smbios_release_buffer'
drivers/platform/x86/dell-laptop.o: In function `dell_micmute_led_set':
dell-laptop.c:(.text+0x21bf): undefined reference to `dell_smbios_find_token'
dell-laptop.c:(.text+0x21ec): undefined reference to `dell_smbios_find_token'
dell-laptop.c:(.text+0x2210): undefined reference to `dell_smbios_get_buffer'
dell-laptop.c:(.text+0x222a): undefined reference to `dell_smbios_send_request'
dell-laptop.c:(.text+0x222f): undefined reference to `dell_smbios_release_buffer'
drivers/platform/x86/dell-laptop.o: In function `dell_init':
>> dell-laptop.c:(.init.text+0x16c): undefined reference to `dell_smbios_get_buffer'
>> dell-laptop.c:(.init.text+0x17d): undefined reference to `dell_smbios_send_request'
>> dell-laptop.c:(.init.text+0x188): undefined reference to `dell_smbios_release_buffer'
dell-laptop.c:(.init.text+0x4b8): undefined reference to `dell_smbios_get_buffer'
dell-laptop.c:(.init.text+0x4d0): undefined reference to `dell_smbios_send_request'
>> dell-laptop.c:(.init.text+0x4f7): undefined reference to `dell_smbios_error'
dell-laptop.c:(.init.text+0x5ce): undefined reference to `dell_smbios_release_buffer'
>> dell-laptop.c:(.init.text+0x5f9): undefined reference to `dell_smbios_find_token'
dell-laptop.c:(.init.text+0x884): undefined reference to `dell_smbios_find_token'
>> dell-laptop.c:(.init.text+0xa10): undefined reference to `dell_laptop_register_notifier'
dell-laptop.c:(.init.text+0xa20): undefined reference to `dell_smbios_find_token'
dell-laptop.c:(.init.text+0xa46): undefined reference to `dell_smbios_get_buffer'
dell-laptop.c:(.init.text+0xa5b): undefined reference to `dell_smbios_send_request'
dell-laptop.c:(.init.text+0xa83): undefined reference to `dell_smbios_release_buffer'
drivers/platform/x86/dell-laptop.o: In function `dell_exit':
>> dell-laptop.c:(.exit.text+0xa): undefined reference to `dell_laptop_unregister_notifier'
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
diff --git a/MAINTAINERS b/MAINTAINERS index 5d8ea24a8ee7..437daa9062e1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4002,6 +4002,12 @@ M: Pali Rohár <pali.rohar@gmail.com> S: Maintained F: drivers/platform/x86/dell-wmi.c +DELL WMI SMBIOS DRIVER +M: Pali Rohár <pali.rohar@gmail.com> +M: Mario Limonciello <mario.limonciello@dell.com> +S: Maintained +F: drivers/platform/x86/dell-wmi-smbios.c + DELTA ST MEDIA DRIVER M: Hugues Fruchet <hugues.fruchet@st.com> 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 <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@redhat.com>"); 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@redhat.com>"); MODULE_AUTHOR("Pali Rohár <pali.rohar@gmail.com>");
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@dell.com> --- 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%)