aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/platform
diff options
context:
space:
mode:
authorMario Limonciello <mario.limonciello@dell.com>2017-11-01 14:25:22 -0500
committerDarren Hart (VMware) <dvhart@infradead.org>2017-11-03 16:33:57 -0700
commitf35a8efe2c34496eaf45f8a9bd5bb7625d34bb5c (patch)
tree423990f1825babcd9918fb3ca9a622523892fc8c /drivers/platform
parentplatform/x86: intel_cht_int33fe: Update fusb302 type string, add properties (diff)
downloadlinux-dev-f35a8efe2c34496eaf45f8a9bd5bb7625d34bb5c.tar.xz
linux-dev-f35a8efe2c34496eaf45f8a9bd5bb7625d34bb5c.zip
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>
Diffstat (limited to 'drivers/platform')
-rw-r--r--drivers/platform/x86/dell-smbios.c4
-rw-r--r--drivers/platform/x86/dell-smbios.h4
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)
command.ebx = virt_to_phys(buffer);
command.ecx = 0x42534931;
- buffer->class = class;
- buffer->select = select;
+ buffer->cmd_class = class;
+ buffer->cmd_select = select;
dcdbas_smi_request(&command);
}
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;
* system management mode, hence the volatiles */
struct calling_interface_buffer {
- u16 class;
- u16 select;
+ u16 cmd_class;
+ u16 cmd_select;
volatile u32 input[4];
volatile u32 output[4];
} __packed;