Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-04 01:51:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

platform/x86: dell-wmi-sysman/think-lmi: Make fw_attr_class global static

Browse Source 
The dell-wmi-sysman and think-lmi kernel modules both have a global
struct class *fw_attr_class variable, leading to the following compile
errors when both are builtin:

ld: drivers/platform/x86/think-lmi.o:(.bss+0x0): multiple definition of `fw_attr_class'; drivers/platform/x86/dell/dell-wmi-sysman/sysman.o:(.bss+0x0): first defined here

In both cases the variable is only used in the file where it is declared.
Make both declarations static to avoid the linker error.

Cc: Mark Pearson <markpearson@lenovo.com>
Cc: Dell.Client.Kernel@dell.com
Reported-by: Nathan Chancellor <nathan@kernel.org>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20210609145952.113393-1-hdegoede@redhat.com
This commit is contained in:
Hans de Goede 2021-06-09 16:59:52 +02:00
parent 8f44f316d1
commit cb58c277ff
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/platform/x86/dell/dell-wmi-sysman/sysman.c
View File

@ -25,7 +25,7 @@ struct wmi_sysman_priv wmi_priv = {
/* reset bios to defaults */ /* reset bios to defaults */
static const char * const reset_types[] = {"builtinsafe", "lastknowngood", "factory", "custom"}; static const char * const reset_types[] = {"builtinsafe", "lastknowngood", "factory", "custom"};
static int reset_option = -1; static int reset_option = -1;
struct class *fw_attr_class; static struct class *fw_attr_class;
/** /**

2
drivers/platform/x86/think-lmi.c
View File

@ -134,7 +134,7 @@ static const char * const encoding_options[] = {
[TLMI_ENCODING_SCANCODE] = "scancode", [TLMI_ENCODING_SCANCODE] = "scancode",
}; };
static struct think_lmi tlmi_priv; static struct think_lmi tlmi_priv;
struct class *fw_attr_class; static struct class *fw_attr_class;
/* ------ Utility functions ------------*/ /* ------ Utility functions ------------*/
/* Convert BIOS WMI error string to suitable error code */ /* Convert BIOS WMI error string to suitable error code */