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 <[email protected]>
Reviewed-by: Edward O'Callaghan <[email protected]>
Signed-off-by: Darren Hart (VMware) <[email protected]>

diff --git a/drivers/platform/x86/dell-smbios.c b/drivers/platform/x86/dell-smbios.c
index e9b1ca07c87279268e26fc23b472eb7377389c24..ffc174638aa4f9def4e74e14163e4ba7af3ac8a2 100644 (file)
--- 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 45cbc2292cd3d703fae5763d05641c1d3e7ec666..742dd8bd66b99cc17107a92bcb04e930ce28a598 100644 (file)
--- 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;