From 53414833fe7979153cd238a8829e0fea01eb1e7b Mon Sep 17 00:00:00 2001 From: Benjamin Romer Date: Fri, 31 Oct 2014 09:57:30 -0400 Subject: [PATCH] staging: unisys: refactor VISORCHIPSET_EXTERNALPORT_INFO Remove the typedef and just use struct visorchipset_externalport_info instead. Fix all CamelCase names: switchNo => switch_no externalPortNo => external_port_no networkZoneGuid => network_zone_uuid pdPort => pd_port ipNetmask => ip_netmask ipBroadcast => ip_broadcast ipNetwork => ip_network ipGateway => ip_gateway ipDNS => ip_dns Reserved1 => reserved1 Reserved2 => reserved2 pendingMsgHdr => pending_msg_hdr Signed-off-by: Benjamin Romer --- .../unisys/visorchipset/visorchipset.h | 31 +++++++++---------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/drivers/staging/unisys/visorchipset/visorchipset.h b/drivers/staging/unisys/visorchipset/visorchipset.h index 762bc1380085..e20eb10e4250 100644 --- a/drivers/staging/unisys/visorchipset/visorchipset.h +++ b/drivers/staging/unisys/visorchipset/visorchipset.h @@ -178,25 +178,24 @@ struct visorchipset_switch_info { /** Attributes for a particular Supervisor external port, which is connected * to a specific switch. */ -typedef struct { - u32 switchNo; - u32 externalPortNo; +struct visorchipset_externalport_info { + u32 switch_no; + u32 external_port_no; struct visorchipset_state state; - uuid_le networkZoneGuid; - int pdPort; + uuid_le network_zone_uuid; + int pd_port; u8 *ip; - u8 *ipNetmask; - u8 *ipBroadcast; - u8 *ipNetwork; - u8 *ipGateway; - u8 *ipDNS; - u64 Reserved1; - u32 Reserved2; /* control_vm_id */ + u8 *ip_netmask; + u8 *ip_broadcast; + u8 *ip_network; + u8 *ip_gateway; + u8 *ip_dns; + u64 reserved1; + u32 reserved2; /* control_vm_id */ struct device dev; BOOL dev_exists; - struct controlvm_message_header pendingMsgHdr; - -} VISORCHIPSET_EXTERNALPORT_INFO; + struct controlvm_message_header pending_msg_hdr; +}; /** Attributes for a particular Supervisor internal port, which is how a * device connects to a particular switch. @@ -278,7 +277,7 @@ BOOL visorchipset_get_device_info(ulong busNo, ulong devNo, BOOL visorchipset_get_switch_info(ulong switchNo, struct visorchipset_switch_info *switchInfo); BOOL visorchipset_get_externalport_info(ulong switchNo, ulong externalPortNo, - VISORCHIPSET_EXTERNALPORT_INFO + struct visorchipset_externalport_info *externalPortInfo); BOOL visorchipset_set_bus_context(ulong busNo, void *context); BOOL visorchipset_set_device_context(ulong busNo, ulong devNo, void *context); -- 2.20.1