| Message ID | 9b1448731683c407ae1a05c5dcfb9aec1102724a.1509561822.git.mario.limonciello@dell.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Delegated to: | Darren Hart |
| Headers | show |
Reviewed-by: Edward O'Callaghan <quasisec@google.com> On Thu, Nov 2, 2017 at 6:25 AM, Mario Limonciello <mario.limonciello@dell.com> wrote: > 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> > --- > drivers/platform/x86/dell-smbios.c | 4 ++-- > 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) > 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; > -- > 2.14.1 >
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;
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> --- drivers/platform/x86/dell-smbios.c | 4 ++-- drivers/platform/x86/dell-smbios.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)