From: Mario Limonciello Date: Wed, 1 Nov 2017 19:25:22 +0000 (-0500) Subject: platform/x86: dell-smbios: Prefix class/select with cmd_ X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=f35a8efe2c34496eaf45f8a9bd5bb7625d34bb5c;p=linux.git 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 Reviewed-by: Edward O'Callaghan Signed-off-by: Darren Hart (VMware) --- diff --git a/drivers/platform/x86/dell-smbios.c b/drivers/platform/x86/dell-smbios.c index e9b1ca07c8727..ffc174638aa4f 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 45cbc2292cd3d..742dd8bd66b99 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;