From c242233e5b578ef08362d98171c10519876d0d93 Mon Sep 17 00:00:00 2001 From: Benjamin Romer Date: Tue, 29 Jul 2014 15:09:40 -0400 Subject: [PATCH] staging: unisys: remove U8 type This patch switches all use of the U8 typedef to use the kernel's u8 type instead. Signed-off-by: Benjamin Romer Signed-off-by: Greg Kroah-Hartman --- .../common-spar/include/channels/channel.h | 54 +++++++-------- .../include/channels/controlframework.h | 4 +- .../include/channels/controlvmchannel.h | 24 +++---- .../include/channels/diagchannel.h | 32 ++++----- .../common-spar/include/channels/iochannel.h | 66 +++++++++---------- .../include/channels/vbuschannel.h | 2 +- .../common-spar/include/vbusdeviceinfo.h | 8 +-- .../common-spar/include/vmcallinterface.h | 8 +-- drivers/staging/unisys/include/commontypes.h | 1 - drivers/staging/unisys/include/uisqueue.h | 14 ++-- drivers/staging/unisys/uislib/uisqueue.c | 8 +-- drivers/staging/unisys/virthba/virthba.c | 2 +- drivers/staging/unisys/virtpci/virtpci.c | 6 +- .../unisys/visorchannel/visorchannel.h | 2 +- .../unisys/visorchannel/visorchannel_funcs.c | 4 +- .../unisys/visorchipset/visorchipset.h | 24 +++---- .../unisys/visorchipset/visorchipset_main.c | 10 +-- 17 files changed, 134 insertions(+), 135 deletions(-) diff --git a/drivers/staging/unisys/common-spar/include/channels/channel.h b/drivers/staging/unisys/common-spar/include/channels/channel.h index d19711de1140..8f3aec9b61a8 100644 --- a/drivers/staging/unisys/common-spar/include/channels/channel.h +++ b/drivers/staging/unisys/common-spar/include/channels/channel.h @@ -70,26 +70,26 @@ typedef enum { CHANNELCLI_OWNED = 5 /* "no worries" state - client can * access channel anytime */ } CHANNEL_CLIENTSTATE; -static inline const U8 * +static inline const u8 * ULTRA_CHANNELCLI_STRING(U32 v) { switch (v) { case CHANNELCLI_DETACHED: - return (const U8 *) ("DETACHED"); + return (const u8 *) ("DETACHED"); case CHANNELCLI_DISABLED: - return (const U8 *) ("DISABLED"); + return (const u8 *) ("DISABLED"); case CHANNELCLI_ATTACHING: - return (const U8 *) ("ATTACHING"); + return (const u8 *) ("ATTACHING"); case CHANNELCLI_ATTACHED: - return (const U8 *) ("ATTACHED"); + return (const u8 *) ("ATTACHED"); case CHANNELCLI_BUSY: - return (const U8 *) ("BUSY"); + return (const u8 *) ("BUSY"); case CHANNELCLI_OWNED: - return (const U8 *) ("OWNED"); + return (const u8 *) ("OWNED"); default: break; } - return (const U8 *) ("?"); + return (const u8 *) ("?"); } #define ULTRA_CHANNELSRV_IS_READY(x) ((x) == CHANNELSRV_READY) @@ -129,7 +129,7 @@ ULTRA_CHANNELCLI_STRING(U32 v) old, \ ULTRA_CHANNELCLI_STRING(new), \ new, \ - PathName_Last_N_Nodes((U8 *)file, 4), \ + PathName_Last_N_Nodes((u8 *)file, 4), \ line); \ } while (0) @@ -237,15 +237,15 @@ typedef struct _CHANNEL_HEADER { * Windows drivers, see ServerStateUp, * ServerStateDown, etc) */ U32 SrvState; /* CHANNEL_SERVERSTATE */ - U8 CliErrorBoot; /* bits to indicate err states for + u8 CliErrorBoot; /* bits to indicate err states for * boot clients, so err messages can * be throttled */ - U8 CliErrorOS; /* bits to indicate err states for OS + u8 CliErrorOS; /* bits to indicate err states for OS * clients, so err messages can be * throttled */ - U8 Filler[1]; /* Pad out to 128 byte cacheline */ + u8 Filler[1]; /* Pad out to 128 byte cacheline */ /* Please add all new single-byte values below here */ - U8 RecoverChannel; + u8 RecoverChannel; } CHANNEL_HEADER, *pCHANNEL_HEADER, ULTRA_CHANNEL_PROTOCOL; #define ULTRA_CHANNEL_ENABLE_INTS (0x1ULL << 0) @@ -283,7 +283,7 @@ typedef struct _SIGNAL_QUEUE_HEADER { U32 ErrorFlags; /* Error bits set during SignalReinit * to denote trouble with client's * fields */ - U8 Filler[12]; /* Pad out to 64 byte cacheline */ + u8 Filler[12]; /* Pad out to 64 byte cacheline */ } SIGNAL_QUEUE_HEADER, *pSIGNAL_QUEUE_HEADER; #pragma pack(pop) @@ -394,10 +394,10 @@ ULTRA_check_channel_server(uuid_le typeGuid, * NOT more than . Note that if the pathname has less than nodes * in it, the return pointer will be to the beginning of the string. */ -static inline U8 * -PathName_Last_N_Nodes(U8 *s, unsigned int n) +static inline u8 * +PathName_Last_N_Nodes(u8 *s, unsigned int n) { - U8 *p = s; + u8 *p = s; unsigned int node_count = 0; while (*p != '\0') { if ((*p == '/') || (*p == '\\')) @@ -419,7 +419,7 @@ PathName_Last_N_Nodes(U8 *s, unsigned int n) } static inline int -ULTRA_channel_client_acquire_os(void __iomem *pChannel, U8 *chanId, +ULTRA_channel_client_acquire_os(void __iomem *pChannel, u8 *chanId, void *logCtx, char *file, int line, char *func) { CHANNEL_HEADER __iomem *pChan = pChannel; @@ -439,7 +439,7 @@ ULTRA_channel_client_acquire_os(void __iomem *pChannel, U8 *chanId, CHANNELSTATE_DIAG_SUBSYS, func, line, "%s Channel StateTransition INVALID! - acquire failed because OS client DISABLED @%s:%d\n", chanId, PathName_Last_N_Nodes( - (U8 *) file, 4), line); + (u8 *) file, 4), line); } return 0; } @@ -456,7 +456,7 @@ ULTRA_channel_client_acquire_os(void __iomem *pChannel, U8 *chanId, readl(&pChan->CliStateOS), ULTRA_CHANNELCLI_STRING(CHANNELCLI_OWNED), CHANNELCLI_OWNED, - PathName_Last_N_Nodes((U8 *) file, 4), line); + PathName_Last_N_Nodes((u8 *) file, 4), line); writel(CHANNELCLI_OWNED, &pChan->CliStateOS); MEMORYBARRIER; } @@ -469,7 +469,7 @@ ULTRA_channel_client_acquire_os(void __iomem *pChannel, U8 *chanId, CHANNELSTATE_DIAG_SEVERITY, CHANNELSTATE_DIAG_SUBSYS, func, line, "%s Channel OS client acquire now successful @%s:%d\n", - chanId, PathName_Last_N_Nodes((U8 *) file, + chanId, PathName_Last_N_Nodes((u8 *) file, 4), line); writeb(0, &pChan->CliErrorOS); } @@ -496,7 +496,7 @@ ULTRA_channel_client_acquire_os(void __iomem *pChannel, U8 *chanId, ULTRA_CHANNELCLI_STRING( readl(&pChan->CliStateOS)), readl(&pChan->CliStateOS), - PathName_Last_N_Nodes((U8 *) file, 4), + PathName_Last_N_Nodes((u8 *) file, 4), line); } return 0; @@ -516,7 +516,7 @@ ULTRA_channel_client_acquire_os(void __iomem *pChannel, U8 *chanId, CHANNELSTATE_DIAG_SEVERITY, CHANNELSTATE_DIAG_SUBSYS, func, line, "%s Channel StateTransition failed - host OS acquire failed because boot BUSY @%s:%d\n", - chanId, PathName_Last_N_Nodes((U8 *) file, + chanId, PathName_Last_N_Nodes((u8 *) file, 4), line); } /* reset busy */ @@ -530,7 +530,7 @@ ULTRA_channel_client_acquire_os(void __iomem *pChannel, U8 *chanId, CHANNELSTATE_DIAG_SEVERITY, CHANNELSTATE_DIAG_SUBSYS, func, line, "%s Channel OS client acquire now successful @%s:%d\n", - chanId, PathName_Last_N_Nodes((U8 *) file, 4), + chanId, PathName_Last_N_Nodes((u8 *) file, 4), line); writeb(0, &pChan->CliErrorOS); } @@ -538,7 +538,7 @@ ULTRA_channel_client_acquire_os(void __iomem *pChannel, U8 *chanId, } static inline void -ULTRA_channel_client_release_os(void __iomem *pChannel, U8 *chanId, +ULTRA_channel_client_release_os(void __iomem *pChannel, u8 *chanId, void *logCtx, char *file, int line, char *func) { CHANNEL_HEADER __iomem *pChan = pChannel; @@ -548,7 +548,7 @@ ULTRA_channel_client_release_os(void __iomem *pChannel, U8 *chanId, CHANNELSTATE_DIAG_SEVERITY, CHANNELSTATE_DIAG_SUBSYS, func, line, "%s Channel OS client error state cleared @%s:%d\n", - chanId, PathName_Last_N_Nodes((U8 *) file, 4), + chanId, PathName_Last_N_Nodes((u8 *) file, 4), line); writeb(0, &pChan->CliErrorOS); } @@ -563,7 +563,7 @@ ULTRA_channel_client_release_os(void __iomem *pChannel, U8 *chanId, ULTRA_CHANNELCLI_STRING( readl(&pChan->CliStateOS)), readl(&pChan->CliStateOS), - PathName_Last_N_Nodes((U8 *) file, 4), line); + PathName_Last_N_Nodes((u8 *) file, 4), line); /* return; */ } writel(CHANNELCLI_ATTACHED, &pChan->CliStateOS); /* release busy */ diff --git a/drivers/staging/unisys/common-spar/include/channels/controlframework.h b/drivers/staging/unisys/common-spar/include/channels/controlframework.h index 1a1c5053fcf8..ca1c46eb7460 100644 --- a/drivers/staging/unisys/common-spar/include/channels/controlframework.h +++ b/drivers/staging/unisys/common-spar/include/channels/controlframework.h @@ -66,9 +66,9 @@ static const ULTRA_SEGMENT_STATE SegmentStateStandby = { typedef union { U64 Full; struct { - U8 Major; /* will be 1 for the first release and + u8 Major; /* will be 1 for the first release and * increment thereafter */ - U8 Minor; + u8 Minor; U16 Maintenance; U32 Revision; /* Subversion revision */ } Part; diff --git a/drivers/staging/unisys/common-spar/include/channels/controlvmchannel.h b/drivers/staging/unisys/common-spar/include/channels/controlvmchannel.h index d8b12a733488..061ff3d4a06a 100644 --- a/drivers/staging/unisys/common-spar/include/channels/controlvmchannel.h +++ b/drivers/staging/unisys/common-spar/include/channels/controlvmchannel.h @@ -142,16 +142,16 @@ struct InterruptInfo { /**< specifies if the recvInterrupt is shared. It, interrupt pin * and vector are used to connect to 0 = not shared; 1 = shared. * the corresponding interrupt. Used by IOPart-GP only. */ - U8 recvInterruptShared; - U8 reserved[3]; /* Natural alignment purposes */ + u8 recvInterruptShared; + u8 reserved[3]; /* Natural alignment purposes */ }; struct PciId { U16 Domain; - U8 Bus; - U8 Slot; - U8 Func; - U8 Reserved[3]; /* Natural alignment purposes */ + u8 Bus; + u8 Slot; + u8 Func; + u8 Reserved[3]; /* Natural alignment purposes */ }; struct PciConfigHdr { @@ -389,7 +389,7 @@ typedef struct _CONTROLVM_MESSAGE_PACKET { struct { U32 busNo; ULTRA_SEGMENT_STATE state; - U8 reserved[2]; /* Natural alignment purposes */ + u8 reserved[2]; /* Natural alignment purposes */ } busChangeState; /* for CONTROLVM_BUS_CHANGESTATE */ struct { U32 busNo; @@ -400,13 +400,13 @@ typedef struct _CONTROLVM_MESSAGE_PACKET { * a physical device */ /* remaining bits in this 32-bit word are available */ } flags; - U8 reserved[2]; /* Natural alignment purposes */ + u8 reserved[2]; /* Natural alignment purposes */ } deviceChangeState; /* for CONTROLVM_DEVICE_CHANGESTATE */ struct { U32 busNo; U32 devNo; ULTRA_SEGMENT_STATE state; - U8 reserved[6]; /* Natural alignment purposes */ + u8 reserved[6]; /* Natural alignment purposes */ } deviceChangeStateEvent; /* for CONTROLVM_DEVICE_CHANGESTATE_EVENT */ struct { U32 busCount; /*< indicates the max number of busses */ @@ -532,13 +532,13 @@ typedef struct _ULTRA_CONTROLVM_CHANNEL_PROTOCOL { U32 InstallationTextId; /* Id of string to display */ U16 InstallationRemainingSteps; /* Number of remaining installation * steps (for progress bars) */ - U8 ToolAction; /* ULTRA_TOOL_ACTIONS Installation Action + u8 ToolAction; /* ULTRA_TOOL_ACTIONS Installation Action * field */ - U8 Reserved; /* alignment */ + u8 Reserved; /* alignment */ ULTRA_EFI_SPAR_INDICATION EfiSparIndication; ULTRA_EFI_SPAR_INDICATION EfiSparIndicationSupported; U32 SPReserved; - U8 Reserved2[28]; /* Force signals to begin on 128-byte cache + u8 Reserved2[28]; /* Force signals to begin on 128-byte cache * line */ SIGNAL_QUEUE_HEADER RequestQueue; /* Service or guest partition * uses this queue to send diff --git a/drivers/staging/unisys/common-spar/include/channels/diagchannel.h b/drivers/staging/unisys/common-spar/include/channels/diagchannel.h index 1bea2f720e48..e16f2c04b4e7 100644 --- a/drivers/staging/unisys/common-spar/include/channels/diagchannel.h +++ b/drivers/staging/unisys/common-spar/include/channels/diagchannel.h @@ -107,16 +107,16 @@ static const uuid_le UltraDiagChannelProtocolGuid = * for use in diagnostic event timestamps... */ typedef struct _DIAG_EFI_TIME { U16 Year; /* 1998 - 20XX */ - U8 Month; /* 1 - 12 */ - U8 Day; /* 1 - 31 */ - U8 Hour; /* 0 - 23 */ - U8 Minute; /* 0 - 59 */ - U8 Second; /* 0 - 59 */ - U8 Pad1; + u8 Month; /* 1 - 12 */ + u8 Day; /* 1 - 31 */ + u8 Hour; /* 0 - 23 */ + u8 Minute; /* 0 - 59 */ + u8 Second; /* 0 - 59 */ + u8 Pad1; U32 Nanosecond; /* 0 - 999, 999, 999 */ S16 TimeZone; /* -1440 to 1440 or 2047 */ - U8 Daylight; - U8 Pad2; + u8 Daylight; + u8 Pad2; } DIAG_EFI_TIME; typedef enum { @@ -158,15 +158,15 @@ typedef enum { typedef struct _DIAG_CHANNEL_EVENT { U32 EventId; U32 Severity; - U8 ModuleName[MAX_MODULE_NAME_SIZE]; + u8 ModuleName[MAX_MODULE_NAME_SIZE]; U32 LineNumber; DIAG_EFI_TIME Timestamp; /* Size = 16 bytes */ U32 PartitionNumber; /* Filled in by Diag Switch as pool blocks are * filled */ U16 VirtualProcessorNumber; U16 LogicalProcessorNumber; - U8 ComponentType; /* ULTRA_COMPONENT_TYPES */ - U8 Subsystem; + u8 ComponentType; /* ULTRA_COMPONENT_TYPES */ + u8 Subsystem; U16 Reserved0; /* pad to U64 alignment */ U32 BlockNumber; /* filled in by DiagSwitch as pool blocks are * filled */ @@ -179,8 +179,8 @@ typedef struct _DIAG_CHANNEL_EVENT { * and referenced only by WinDiagDisplay formatting tool as * additional diagnostic information. Other tools including * WinDiagDisplay currently ignore these 'Reserved' bytes. */ - U8 Reserved[8]; - U8 AdditionalInfo[MAX_ADDITIONAL_INFO_SIZE]; + u8 Reserved[8]; + u8 AdditionalInfo[MAX_ADDITIONAL_INFO_SIZE]; /* NOTE: Changesto DIAG_CHANNEL_EVENT generally need to be reflected in * existing copies * @@ -364,9 +364,9 @@ typedef enum { */ typedef struct _DIAG_CHANNEL_PROTOCOL_HEADER { volatile U32 DiagLock; - U8 IsChannelInitialized; - U8 Reserved[3]; - U8 SubsystemSeverityFilter[64]; + u8 IsChannelInitialized; + u8 Reserved[3]; + u8 SubsystemSeverityFilter[64]; } DIAG_CHANNEL_PROTOCOL_HEADER; /* The Diagram for the Diagnostic Channel: */ diff --git a/drivers/staging/unisys/common-spar/include/channels/iochannel.h b/drivers/staging/unisys/common-spar/include/channels/iochannel.h index 6dcfa6e78375..0f13304566e4 100644 --- a/drivers/staging/unisys/common-spar/include/channels/iochannel.h +++ b/drivers/staging/unisys/common-spar/include/channels/iochannel.h @@ -213,7 +213,7 @@ typedef enum { NET_RCV_POST = 0, /* submit buffer to hold receiving #endif /* MAX_MACADDR_LEN */ #define ETH_IS_LOCALLY_ADMINISTERED(Address) \ - (((U8 *) (Address))[0] & ((U8) 0x02)) + (((u8 *) (Address))[0] & ((u8) 0x02)) #define NIC_VENDOR_ID 0x0008000B /* various types of scsi task mgmt commands */ @@ -287,7 +287,7 @@ struct vhba_config_max { /* 20 bytes */ struct uiscmdrsp_scsi { void *scsicmd; /* the handle to the cmd that was received - * send it back as is in the rsp packet. */ - U8 cmnd[MAX_CMND_SIZE]; /* the cdb for the command */ + u8 cmnd[MAX_CMND_SIZE]; /* the cdb for the command */ U32 bufflen; /* length of data to be transferred out or in */ U16 guest_phys_entries; /* Number of entries in scatter-gather (sg) * list */ @@ -302,8 +302,8 @@ struct uiscmdrsp_scsi { * originator */ int linuxstat; /* the original Linux status - for use by linux * vdisk code */ - U8 scsistat; /* the scsi status */ - U8 addlstat; /* non-scsi status - covers cases like timeout + u8 scsistat; /* the scsi status */ + u8 addlstat; /* non-scsi status - covers cases like timeout * needed by windows guests */ #define ADDL_RESET 1 #define ADDL_TIMEOUT 2 @@ -314,7 +314,7 @@ struct uiscmdrsp_scsi { #define ADDL_RETRY 7 /* the following fields are need to determine the result of command */ - U8 sensebuf[MAX_SENSE_SIZE]; /* sense info in case cmd failed; */ + u8 sensebuf[MAX_SENSE_SIZE]; /* sense info in case cmd failed; */ /* it holds the sense_data struct; */ /* see that struct for details. */ void *vdisk; /* contains pointer to the vdisk so that we can clean up @@ -379,13 +379,13 @@ struct uiscmdrsp_scsi { MEMSET(buf, 0, \ MINNUM(len, \ (unsigned int) NO_DISK_INQUIRY_RESULT_LEN)); \ - buf[2] = (U8) SCSI_SPC2_VER; \ + buf[2] = (u8) SCSI_SPC2_VER; \ if (lun == 0) { \ - buf[0] = (U8) lun0notpresent; \ - buf[3] = (U8) DEV_HISUPPORT; \ + buf[0] = (u8) lun0notpresent; \ + buf[3] = (u8) DEV_HISUPPORT; \ } else \ - buf[0] = (U8) notpresent; \ - buf[4] = (U8) ( \ + buf[0] = (u8) notpresent; \ + buf[4] = (u8) ( \ MINNUM(len, \ (unsigned int) NO_DISK_INQUIRY_RESULT_LEN) - 5); \ if (len >= NO_DISK_INQUIRY_RESULT_LEN) { \ @@ -430,21 +430,21 @@ struct uiscmdrsp_scsi { * AdditionalSenseLength contains will be sizeof(sense_data)-8=10. */ struct sense_data { - U8 ErrorCode:7; - U8 Valid:1; - U8 SegmentNumber; - U8 SenseKey:4; - U8 Reserved:1; - U8 IncorrectLength:1; - U8 EndOfMedia:1; - U8 FileMark:1; - U8 Information[4]; - U8 AdditionalSenseLength; - U8 CommandSpecificInformation[4]; - U8 AdditionalSenseCode; - U8 AdditionalSenseCodeQualifier; - U8 FieldReplaceableUnitCode; - U8 SenseKeySpecific[3]; + u8 ErrorCode:7; + u8 Valid:1; + u8 SegmentNumber; + u8 SenseKey:4; + u8 Reserved:1; + u8 IncorrectLength:1; + u8 EndOfMedia:1; + u8 FileMark:1; + u8 Information[4]; + u8 AdditionalSenseLength; + u8 CommandSpecificInformation[4]; + u8 AdditionalSenseCode; + u8 AdditionalSenseCodeQualifier; + u8 FieldReplaceableUnitCode; + u8 SenseKeySpecific[3]; }; /* some SCSI ADSENSE codes */ @@ -487,10 +487,10 @@ struct net_pkt_xmt { struct { /* these are needed for csum at uisnic end */ - U8 valid; /* 1 = rest of this struct is valid - else + u8 valid; /* 1 = rest of this struct is valid - else * ignore */ - U8 hrawoffv; /* 1 = hwrafoff is valid */ - U8 nhrawoffv; /* 1 = nhwrafoff is valid */ + u8 hrawoffv; /* 1 = hwrafoff is valid */ + u8 nhrawoffv; /* 1 = nhwrafoff is valid */ U16 protocol; /* specifies packet protocol */ U32 csum; /* value used to set skb->csum at IOPart */ U32 hrawoff; /* value used to set skb->h.raw at IOPart */ @@ -539,7 +539,7 @@ struct net_pkt_rcv { /* the number of receive buffers that can be chained */ /* is based on max mtu and size of each rcv buf */ U32 rcv_done_len; /* length of received data */ - U8 numrcvbufs; /* number of receive buffers that contain the */ + u8 numrcvbufs; /* number of receive buffers that contain the */ /* incoming data; guest end MUST chain these together. */ void *rcvbuf[MAX_NET_RCV_CHAIN]; /* the list of receive buffers * that must be chained; */ @@ -556,7 +556,7 @@ struct net_pkt_enbdis { struct net_pkt_macaddr { void *context; - U8 macaddr[MAX_MACADDR_LEN]; /* 6 bytes */ + u8 macaddr[MAX_MACADDR_LEN]; /* 6 bytes */ }; /* cmd rsp packet used for VNIC network traffic */ @@ -615,7 +615,7 @@ struct uiscmdrsp_scsitaskmgmt { * Guest */ /* Note that the vHba pointer is not used by the Client/Guest side. */ struct uiscmdrsp_disknotify { - U8 add; /* 0-remove, 1-add */ + u8 add; /* 0-remove, 1-add */ void *vHba; /* Pointer to vhba_info for channel info to * route msg */ U32 channel, id, lun; /* SCSI Path of Disk to added or removed */ @@ -695,7 +695,7 @@ typedef struct _ULTRA_IO_CHANNEL_PROTOCOL { struct vhba_config_max max; /* 20 bytes */ } vhba; /* 28 */ struct { - U8 macaddr[MAX_MACADDR_LEN]; /* 6 bytes */ + u8 macaddr[MAX_MACADDR_LEN]; /* 6 bytes */ U32 num_rcv_bufs; /* 4 */ U32 mtu; /* 4 */ uuid_le zoneGuid; /* 16 */ @@ -703,7 +703,7 @@ typedef struct _ULTRA_IO_CHANNEL_PROTOCOL { }; #define MAX_CLIENTSTRING_LEN 1024 - U8 clientString[MAX_CLIENTSTRING_LEN]; /* NULL terminated - so holds + u8 clientString[MAX_CLIENTSTRING_LEN]; /* NULL terminated - so holds * max - 1 bytes */ } ULTRA_IO_CHANNEL_PROTOCOL; diff --git a/drivers/staging/unisys/common-spar/include/channels/vbuschannel.h b/drivers/staging/unisys/common-spar/include/channels/vbuschannel.h index 69de9d944fd3..cd94c8f91780 100644 --- a/drivers/staging/unisys/common-spar/include/channels/vbuschannel.h +++ b/drivers/staging/unisys/common-spar/include/channels/vbuschannel.h @@ -73,7 +73,7 @@ typedef struct _ULTRA_VBUS_HEADERINFO { /* to the the BusInfo struct (below) */ U32 devInfoByteOffset; /* byte offset from beginning of this struct */ /* to the the DevInfo array (below) */ - U8 reserved[104]; + u8 reserved[104]; } ULTRA_VBUS_HEADERINFO; typedef struct _ULTRA_VBUS_CHANNEL_PROTOCOL { diff --git a/drivers/staging/unisys/common-spar/include/vbusdeviceinfo.h b/drivers/staging/unisys/common-spar/include/vbusdeviceinfo.h index 45e311cdf8de..5e0d98cd422e 100644 --- a/drivers/staging/unisys/common-spar/include/vbusdeviceinfo.h +++ b/drivers/staging/unisys/common-spar/include/vbusdeviceinfo.h @@ -26,11 +26,11 @@ * and driver from the client's perspective. */ typedef struct _ULTRA_VBUS_DEVICEINFO { - U8 devType[16]; /* short string identifying the device type */ - U8 drvName[16]; /* driver .sys file name */ - U8 infoStrings[96]; /* sequence of tab-delimited id strings: */ + u8 devType[16]; /* short string identifying the device type */ + u8 drvName[16]; /* driver .sys file name */ + u8 infoStrings[96]; /* sequence of tab-delimited id strings: */ /* */ - U8 reserved[128]; /* pad size to 256 bytes */ + u8 reserved[128]; /* pad size to 256 bytes */ } ULTRA_VBUS_DEVICEINFO; #pragma pack(pop) diff --git a/drivers/staging/unisys/common-spar/include/vmcallinterface.h b/drivers/staging/unisys/common-spar/include/vmcallinterface.h index c5c10f3f1eb4..5c790494e621 100644 --- a/drivers/staging/unisys/common-spar/include/vmcallinterface.h +++ b/drivers/staging/unisys/common-spar/include/vmcallinterface.h @@ -120,7 +120,7 @@ typedef struct _VMCALL_IO_CONTROLVM_ADDR_PARAMS { /* the size of the ControlVm channel in bytes This VMCall fills this * in with the appropriate address. */ U32 ChannelBytes; /* contents provided by this VMCALL (OUT) */ - U8 Unused[4]; /* Unused Bytes in the 64-Bit Aligned Struct */ + u8 Unused[4]; /* Unused Bytes in the 64-Bit Aligned Struct */ } VMCALL_IO_CONTROLVM_ADDR_PARAMS; #pragma pack(pop) @@ -155,12 +155,12 @@ typedef struct _VMCALL_IO_VISORSERIAL_ADDR_PARAMS { /* Parameters to VMCALL_CHANNEL_MISMATCH interface */ typedef struct _VMCALL_CHANNEL_VERSION_MISMATCH_PARAMS { - U8 ChannelName[32]; /* Null terminated string giving name of channel + u8 ChannelName[32]; /* Null terminated string giving name of channel * (IN) */ - U8 ItemName[32]; /* Null terminated string giving name of + u8 ItemName[32]; /* Null terminated string giving name of * mismatched item (IN) */ U32 SourceLineNumber; /* line# where invoked. (IN) */ - U8 SourceFileName[36]; /* source code where invoked - Null terminated + u8 SourceFileName[36]; /* source code where invoked - Null terminated * string (IN) */ } VMCALL_CHANNEL_VERSION_MISMATCH_PARAMS; diff --git a/drivers/staging/unisys/include/commontypes.h b/drivers/staging/unisys/include/commontypes.h index 9de6f9dc5fbf..fbcf15bf19bd 100644 --- a/drivers/staging/unisys/include/commontypes.h +++ b/drivers/staging/unisys/include/commontypes.h @@ -30,7 +30,6 @@ #include #endif -#define U8 uint8_t #define U16 uint16_t #define U32 uint32_t #define U64 uint64_t diff --git a/drivers/staging/unisys/include/uisqueue.h b/drivers/staging/unisys/include/uisqueue.h index 2a5bea3b3325..535cf1f3119e 100644 --- a/drivers/staging/unisys/include/uisqueue.h +++ b/drivers/staging/unisys/include/uisqueue.h @@ -94,7 +94,7 @@ int uisqueue_put_cmdrsp_with_lock_client(struct uisqueue_info *queueinfo, unsigned char issueInterruptIfEmpty, U64 interruptHandle, char oktowait, - U8 *channelId); + u8 *channelId); /* uisqueue_get_cmdrsp gets the cmdrsp entry at the head of the queue * and copies it to the area pointed by cmdrsp param. @@ -108,7 +108,7 @@ uisqueue_get_cmdrsp(struct uisqueue_info *queueinfo, void *cmdrsp, #define MAX_NAME_SIZE_UISQUEUE 64 struct extport_info { - U8 valid:1; + u8 valid:1; /* if 1, indicates this extport slot is occupied * if 0, indicates that extport slot is unoccupied */ @@ -172,7 +172,7 @@ struct bus_info { char name[25]; char partitionName[99]; struct bus_info *next; - U8 localVnic; /* 1 if local vnic created internally + u8 localVnic; /* 1 if local vnic created internally * by IOVM; 0 otherwise... */ }; @@ -182,7 +182,7 @@ struct bus_info { struct sn_list_entry { struct uisscsi_dest pdest; /* scsi bus, target, lun for * phys disk */ - U8 sernum[MAX_SERIAL_NUM]; /* serial num of physical + u8 sernum[MAX_SERIAL_NUM]; /* serial num of physical * disk.. The length is always * MAX_SERIAL_NUM, padded with * spaces */ @@ -247,9 +247,9 @@ struct add_virt_iopart { * switch to which the vnic is * connected */ - U8 useG2GCopy; /* Used to determine if a virtual HBA + u8 useG2GCopy; /* Used to determine if a virtual HBA * needs to use G2G copy. */ - U8 Filler[7]; + u8 Filler[7]; U32 busNo; U32 devNo; @@ -263,7 +263,7 @@ struct add_vdisk_iopart { int implicit; struct uisscsi_dest vdest; /* scsi bus, target, lun for virt disk */ struct uisscsi_dest pdest; /* scsi bus, target, lun for phys disk */ - U8 sernum[MAX_SERIAL_NUM]; /* serial num of physical disk */ + u8 sernum[MAX_SERIAL_NUM]; /* serial num of physical disk */ U32 serlen; /* length of serial num */ U32 busNo; U32 devNo; diff --git a/drivers/staging/unisys/uislib/uisqueue.c b/drivers/staging/unisys/uislib/uisqueue.c index d4a6074cfaf0..12edf605f19c 100644 --- a/drivers/staging/unisys/uislib/uisqueue.c +++ b/drivers/staging/unisys/uislib/uisqueue.c @@ -71,19 +71,19 @@ uisqueue_InterlockedAnd(unsigned long long __iomem *Target, } EXPORT_SYMBOL_GPL(uisqueue_InterlockedAnd); -static U8 +static u8 do_locked_client_insert(struct uisqueue_info *queueinfo, unsigned int whichqueue, void *pSignal, spinlock_t *lock, unsigned char issueInterruptIfEmpty, - U64 interruptHandle, U8 *channelId) + U64 interruptHandle, u8 *channelId) { unsigned long flags; unsigned char queueWasEmpty; unsigned int locked = 0; unsigned int acquired = 0; - U8 rc = 0; + u8 rc = 0; spin_lock_irqsave(lock, flags); locked = 1; @@ -125,7 +125,7 @@ uisqueue_put_cmdrsp_with_lock_client(struct uisqueue_info *queueinfo, void *insertlock, unsigned char issueInterruptIfEmpty, U64 interruptHandle, - char oktowait, U8 *channelId) + char oktowait, u8 *channelId) { while (!do_locked_client_insert(queueinfo, whichqueue, cmdrsp, (spinlock_t *) insertlock, diff --git a/drivers/staging/unisys/virthba/virthba.c b/drivers/staging/unisys/virthba/virthba.c index ef7242ee7ad3..48a03b488c75 100644 --- a/drivers/staging/unisys/virthba/virthba.c +++ b/drivers/staging/unisys/virthba/virthba.c @@ -196,7 +196,7 @@ struct virthba_info { /* Work Data for DARWorkQ */ struct diskaddremove { - U8 add; /* 0-remove, 1-add */ + u8 add; /* 0-remove, 1-add */ struct Scsi_Host *shost; /* Scsi Host for this virthba instance */ U32 channel, id, lun; /* Disk Path */ struct diskaddremove *next; diff --git a/drivers/staging/unisys/virtpci/virtpci.c b/drivers/staging/unisys/virtpci/virtpci.c index a80617fc61c9..d9443a968ddf 100644 --- a/drivers/staging/unisys/virtpci/virtpci.c +++ b/drivers/staging/unisys/virtpci/virtpci.c @@ -196,7 +196,7 @@ static int write_vbus_chpInfo(ULTRA_VBUS_CHANNEL_PROTOCOL *chan, LOGERR("vbus channel not used, because chpInfoByteOffset == 0"); return -1; } - memcpy(((U8 *) (chan)) + off, info, sizeof(*info)); + memcpy(((u8 *) (chan)) + off, info, sizeof(*info)); return 0; } @@ -214,7 +214,7 @@ static int write_vbus_busInfo(ULTRA_VBUS_CHANNEL_PROTOCOL *chan, LOGERR("vbus channel not used, because busInfoByteOffset == 0"); return -1; } - memcpy(((U8 *) (chan)) + off, info, sizeof(*info)); + memcpy(((u8 *) (chan)) + off, info, sizeof(*info)); return 0; } @@ -238,7 +238,7 @@ write_vbus_devInfo(ULTRA_VBUS_CHANNEL_PROTOCOL *chan, LOGERR("vbus channel not used, because devInfoByteOffset == 0"); return -1; } - memcpy(((U8 *) (chan)) + off, info, sizeof(*info)); + memcpy(((u8 *) (chan)) + off, info, sizeof(*info)); return 0; } diff --git a/drivers/staging/unisys/visorchannel/visorchannel.h b/drivers/staging/unisys/visorchannel/visorchannel.h index ecf0d11117e9..9de4f8a5bfce 100644 --- a/drivers/staging/unisys/visorchannel/visorchannel.h +++ b/drivers/staging/unisys/visorchannel/visorchannel.h @@ -55,7 +55,7 @@ int visorchannel_read(VISORCHANNEL *channel, ulong offset, int visorchannel_write(VISORCHANNEL *channel, ulong offset, void *local, ulong nbytes); int visorchannel_clear(VISORCHANNEL *channel, ulong offset, - U8 ch, ulong nbytes); + u8 ch, ulong nbytes); BOOL visorchannel_signalremove(VISORCHANNEL *channel, U32 queue, void *msg); BOOL visorchannel_signalinsert(VISORCHANNEL *channel, U32 queue, void *msg); int visorchannel_signalqueue_slots_avail(VISORCHANNEL *channel, U32 queue); diff --git a/drivers/staging/unisys/visorchannel/visorchannel_funcs.c b/drivers/staging/unisys/visorchannel/visorchannel_funcs.c index a44da7c84ae3..8d0964a25352 100644 --- a/drivers/staging/unisys/visorchannel/visorchannel_funcs.c +++ b/drivers/staging/unisys/visorchannel/visorchannel_funcs.c @@ -242,12 +242,12 @@ visorchannel_write(VISORCHANNEL *channel, ulong offset, EXPORT_SYMBOL_GPL(visorchannel_write); int -visorchannel_clear(VISORCHANNEL *channel, ulong offset, U8 ch, ulong nbytes) +visorchannel_clear(VISORCHANNEL *channel, ulong offset, u8 ch, ulong nbytes) { int rc = -1; int bufsize = 65536; int written = 0; - U8 *buf = vmalloc(bufsize); + u8 *buf = vmalloc(bufsize); if (buf == NULL) { ERRDRV("%s failed memory allocation", __func__); diff --git a/drivers/staging/unisys/visorchipset/visorchipset.h b/drivers/staging/unisys/visorchipset/visorchipset.h index e01cc7207bae..ef2bc23c4e88 100644 --- a/drivers/staging/unisys/visorchipset/visorchipset.h +++ b/drivers/staging/unisys/visorchipset/visorchipset.h @@ -129,8 +129,8 @@ typedef struct { VISORCHIPSET_CHANNEL_INFO chanInfo; uuid_le partitionGuid; U64 partitionHandle; - U8 *name; /* UTF8 */ - U8 *description; /* UTF8 */ + u8 *name; /* UTF8 */ + u8 *description; /* UTF8 */ U64 Reserved1; U32 Reserved2; MYPROCOBJECT *procObject; @@ -164,10 +164,10 @@ typedef struct { U32 switchNo; VISORCHIPSET_STATE state; uuid_le switchTypeGuid; - U8 *authService1; - U8 *authService2; - U8 *authService3; - U8 *securityContext; + u8 *authService1; + u8 *authService2; + u8 *authService3; + u8 *securityContext; U64 Reserved; U32 Reserved2; /* CONTROLVM_ID */ struct device dev; @@ -185,12 +185,12 @@ typedef struct { VISORCHIPSET_STATE state; uuid_le networkZoneGuid; int pdPort; - U8 *ip; - U8 *ipNetmask; - U8 *ipBroadcast; - U8 *ipNetwork; - U8 *ipGateway; - U8 *ipDNS; + u8 *ip; + u8 *ipNetmask; + u8 *ipBroadcast; + u8 *ipNetwork; + u8 *ipGateway; + u8 *ipDNS; U64 Reserved1; U32 Reserved2; /* CONTROLVM_ID */ struct device dev; diff --git a/drivers/staging/unisys/visorchipset/visorchipset_main.c b/drivers/staging/unisys/visorchipset/visorchipset_main.c index 858f5c5c19d0..3afa6e5b10dd 100644 --- a/drivers/staging/unisys/visorchipset/visorchipset_main.c +++ b/drivers/staging/unisys/visorchipset/visorchipset_main.c @@ -66,7 +66,7 @@ static int serverregistered; static int clientregistered; #define MAX_CHIPSET_EVENTS 2 -static U8 chipset_events[MAX_CHIPSET_EVENTS] = { 0, 0 }; +static u8 chipset_events[MAX_CHIPSET_EVENTS] = { 0, 0 }; static struct delayed_work Periodic_controlvm_work; static struct workqueue_struct *Periodic_controlvm_workqueue; @@ -104,7 +104,7 @@ static LIST_HEAD(DevInfoList); static VISORCHANNEL *ControlVm_channel; typedef struct { - U8 __iomem *ptr; /* pointer to base address of payload pool */ + u8 __iomem *ptr; /* pointer to base address of payload pool */ U64 offset; /* offset from beginning of controlvm * channel to beginning of payload * pool */ U32 bytes; /* number of bytes in payload pool */ @@ -565,11 +565,11 @@ devInfo_clear(void *v) memset(p, 0, sizeof(VISORCHIPSET_DEVICE_INFO)); } -static U8 +static u8 check_chipset_events(void) { int i; - U8 send_msg = 1; + u8 send_msg = 1; /* Check events to determine if response should be sent */ for (i = 0; i < MAX_CHIPSET_EVENTS; i++) send_msg &= chipset_events[i]; @@ -1369,7 +1369,7 @@ static int initialize_controlvm_payload_info(HOSTADDRESS phys_addr, U64 offset, U32 bytes, CONTROLVM_PAYLOAD_INFO *info) { - U8 __iomem *payload = NULL; + u8 __iomem *payload = NULL; int rc = CONTROLVM_RESP_SUCCESS; if (info == NULL) { -- 2.39.5