diff options
author | Mario Limonciello <mario.limonciello@dell.com> | 2017-11-01 15:25:22 -0400 |
---|---|---|
committer | Darren Hart (VMware) <dvhart@infradead.org> | 2017-11-03 19:33:57 -0400 |
commit | f35a8efe2c34496eaf45f8a9bd5bb7625d34bb5c (patch) | |
tree | 423990f1825babcd9918fb3ca9a622523892fc8c | |
parent | 455e027f33a03ddffe82c36f430a4d173e840b75 (diff) |
platform/x86: dell-smbios: Prefix class/select with cmd_
Later on these structures will be brought up to userspace.
the word "class" is a reserved word in c++ and this will prevent
uapi headers from being included directly in c++ programs.
To make life easier on these applications, prepare the change now.
Signed-off-by: Mario Limonciello <mario.limonciello@dell.com>
Reviewed-by: Edward O'Callaghan <quasisec@google.com>
Signed-off-by: Darren Hart (VMware) <dvhart@infradead.org>
-rw-r--r-- | drivers/platform/x86/dell-smbios.c | 4 | ||||
-rw-r--r-- | drivers/platform/x86/dell-smbios.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/platform/x86/dell-smbios.c b/drivers/platform/x86/dell-smbios.c index e9b1ca07c872..ffc174638aa4 100644 --- a/drivers/platform/x86/dell-smbios.c +++ b/drivers/platform/x86/dell-smbios.c | |||
@@ -86,8 +86,8 @@ void dell_smbios_send_request(int class, int select) | |||
86 | command.ebx = virt_to_phys(buffer); | 86 | command.ebx = virt_to_phys(buffer); |
87 | command.ecx = 0x42534931; | 87 | command.ecx = 0x42534931; |
88 | 88 | ||
89 | buffer->class = class; | 89 | buffer->cmd_class = class; |
90 | buffer->select = select; | 90 | buffer->cmd_select = select; |
91 | 91 | ||
92 | dcdbas_smi_request(&command); | 92 | dcdbas_smi_request(&command); |
93 | } | 93 | } |
diff --git a/drivers/platform/x86/dell-smbios.h b/drivers/platform/x86/dell-smbios.h index 45cbc2292cd3..742dd8bd66b9 100644 --- a/drivers/platform/x86/dell-smbios.h +++ b/drivers/platform/x86/dell-smbios.h | |||
@@ -22,8 +22,8 @@ struct notifier_block; | |||
22 | * system management mode, hence the volatiles */ | 22 | * system management mode, hence the volatiles */ |
23 | 23 | ||
24 | struct calling_interface_buffer { | 24 | struct calling_interface_buffer { |
25 | u16 class; | 25 | u16 cmd_class; |
26 | u16 select; | 26 | u16 cmd_select; |
27 | volatile u32 input[4]; | 27 | volatile u32 input[4]; |
28 | volatile u32 output[4]; | 28 | volatile u32 output[4]; |
29 | } __packed; | 29 | } __packed; |