From 6f5a5b7b501e38fa6cc6faae39a19b819f712a11 Mon Sep 17 00:00:00 2001 From: Benjamin Romer Date: Thu, 23 Oct 2014 14:30:33 -0400 Subject: [PATCH] staging: unisys: refactor GUEST_DEVICES Remove the typedef from GUEST_DEVICES and switch to struct guest_devices. Fix CamelCase names and update all references to renamed members. VideoChannel => video_channel KeyboardChannel => keyboard_channel NetworkChannel => network_channel StorageChannel => storage_channel ConsoleChannel => console_channel PartitionIndex => partition_index Pad => pad Signed-off-by: Benjamin Romer Signed-off-by: Greg Kroah-Hartman --- .../include/channels/controlvmchannel.h | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/staging/unisys/common-spar/include/channels/controlvmchannel.h b/drivers/staging/unisys/common-spar/include/channels/controlvmchannel.h index 5aff65dd9d04..363967a55267 100644 --- a/drivers/staging/unisys/common-spar/include/channels/controlvmchannel.h +++ b/drivers/staging/unisys/common-spar/include/channels/controlvmchannel.h @@ -350,15 +350,15 @@ struct device_map { u64 reserved2; /* Align structure on 32-byte boundary */ }; -typedef struct _GUEST_DEVICES { - struct device_map VideoChannel; - struct device_map KeyboardChannel; - struct device_map NetworkChannel; - struct device_map StorageChannel; - struct device_map ConsoleChannel; - u32 PartitionIndex; - u32 Pad; -} GUEST_DEVICES; +struct guest_devices { + struct device_map video_channel; + struct device_map keyboard_channel; + struct device_map network_channel; + struct device_map storage_channel; + struct device_map console_channel; + u32 partition_index; + u32 pad; +}; typedef struct _ULTRA_CONTROLVM_CHANNEL_PROTOCOL { struct channel_header Header; @@ -394,7 +394,7 @@ typedef struct _ULTRA_CONTROLVM_CHANNEL_PROTOCOL { GUEST_PHYSICAL_ADDRESS gpPhysicalSmbiosTable; /* guest phys addr of * SMBIOS table */ /* ULTRA_MAX_GUESTS_PER_SERVICE */ - GUEST_DEVICES gpObsoleteGuestDevices[16]; + struct guest_devices gpObsoleteGuestDevices[16]; /* guest physical address of EFI firmware image base */ GUEST_PHYSICAL_ADDRESS VirtualGuestFirmwareImageBase; -- 2.39.5