Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b06bdf7d authored by Benjamin Romer's avatar Benjamin Romer Committed by Greg Kroah-Hartman
Browse files

staging: unisys: remove U16 type 



This patch switches all use of the U16 typedef to use the kernel's u16 type
instead.

Signed-off-by: default avatarBenjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent bf6c0d11

drivers/staging/unisys/common-spar/include/channels/controlframework.h

+9 −9
Original line number Diff line number Diff line
@@ -37,19 +37,19 @@ 
/* Define Ki scale page to be traditional 4KB page */

#define ULTRA_MEMORY_PAGE_Ki (ULTRA_MEMORY_PAGE_WORD * ULTRA_MEMORY_COUNT_Ki)

typedef struct _ULTRA_SEGMENT_STATE  {

	U16 Enabled:1;		/* Bit 0: May enter other states */

	U16 Active:1;		/* Bit 1: Assigned to active partition */

	U16 Alive:1;		/* Bit 2: Configure message sent to

	u16 Enabled:1;		/* Bit 0: May enter other states */

	u16 Active:1;		/* Bit 1: Assigned to active partition */

	u16 Alive:1;		/* Bit 2: Configure message sent to

				 * service/server */

	U16 Revoked:1;		/* Bit 3: similar to partition state

	u16 Revoked:1;		/* Bit 3: similar to partition state

				 * ShuttingDown */

	U16 Allocated:1;	/* Bit 4: memory (device/port number)

	u16 Allocated:1;	/* Bit 4: memory (device/port number)

				 * has been selected by Command */

	U16 Known:1;		/* Bit 5: has been introduced to the

	u16 Known:1;		/* Bit 5: has been introduced to the

				 * service/guest partition */

	U16 Ready:1;		/* Bit 6: service/Guest partition has

	u16 Ready:1;		/* Bit 6: service/Guest partition has

				 * responded to introduction */

	U16 Operating:1;	/* Bit 7: resource is configured and

	u16 Operating:1;	/* Bit 7: resource is configured and

				 * operating */

	/* Note: don't use high bit unless we need to switch to ushort

	 * which is non-compliant */
@@ -69,7 +69,7 @@ typedef union { 
		u8 Major;	/* will be 1 for the first release and

				 * increment thereafter  */

		u8 Minor;

		U16 Maintenance;

		u16 Maintenance;

		U32 Revision;	/* Subversion revision */

	} Part;

} ULTRA_COMPONENT_VERSION;

drivers/staging/unisys/common-spar/include/channels/controlvmchannel.h

+12 −12
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ struct InterruptInfo { 
};



struct PciId {

	U16 Domain;

	u16 Domain;

	u8 Bus;

	u8 Slot;

	u8 Func;
@@ -155,10 +155,10 @@ struct PciId { 
};



struct PciConfigHdr {

	U16 VendorId;

	U16 SubSysVendor;

	U16 DeviceId;

	U16 SubSysDevice;

	u16 VendorId;

	u16 SubSysVendor;

	u16 DeviceId;

	u16 SubSysDevice;

	U32 ClassCode;

	U32 Reserved;		/* Natural alignment purposes */

};
@@ -181,10 +181,10 @@ struct virtDiskInfo { 
	U32 externalPortNo;	/* 0 for SAS RAID provided (external)

				 * virtual disks, 1 for virtual disk

				 * images, 2 for gold disk images */

	U16 VirtualDiskIndex;	/* Index of disk descriptor in the

	u16 VirtualDiskIndex;	/* Index of disk descriptor in the

				 * VirtualDisk segment associated with

				 * externalPortNo */

	U16 Reserved1;

	u16 Reserved1;

	U32 Reserved2;

};
@@ -519,18 +519,18 @@ typedef struct _ULTRA_CONTROLVM_CHANNEL_PROTOCOL { 
	 U64 PrototypeControlChannelOffset;

	 GUEST_PHYSICAL_ADDRESS VirtualGuestPartitionHandle;



	 U16 RestoreAction;	/* Restore Action field to restore the guest

	 u16 RestoreAction;	/* Restore Action field to restore the guest

				 * partition */

	U16 DumpAction;		/* For Windows guests it shows if the visordisk

	u16 DumpAction;		/* For Windows guests it shows if the visordisk

				 * is running in dump mode */

	U16 NvramFailCount;

	U16 SavedCrashMsgCount;	/* = CONTROLVM_CRASHMSG_MAX */

	u16 NvramFailCount;

	u16 SavedCrashMsgCount;	/* = CONTROLVM_CRASHMSG_MAX */

	U32 SavedCrashMsgOffset;	/* Offset to request payload area needed

					 * for crash dump */

	U32 InstallationError;	/* Type of error encountered during

				 * installation */

	U32 InstallationTextId;	/* Id of string to display */

	U16 InstallationRemainingSteps;	/* Number of remaining installation

	u16 InstallationRemainingSteps;	/* Number of remaining installation

					 * steps (for progress bars) */

	u8 ToolAction;		/* ULTRA_TOOL_ACTIONS Installation Action

				 * field */

drivers/staging/unisys/common-spar/include/channels/diagchannel.h

+4 −4
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ static const uuid_le UltraDiagChannelProtocolGuid = 
* in some of the Supervisor areas, such as Monitor, so it has been "ported" here

* for use in diagnostic event timestamps... */

typedef struct _DIAG_EFI_TIME  {

	U16 Year;		/* 1998 - 20XX */

	u16 Year;		/* 1998 - 20XX */

	u8 Month;		/* 1 - 12 */

	u8 Day;			/* 1 - 31 */

	u8 Hour;		/* 0 - 23 */
@@ -163,11 +163,11 @@ typedef struct _DIAG_CHANNEL_EVENT { 
	DIAG_EFI_TIME Timestamp;	/* Size = 16 bytes */

	U32 PartitionNumber;	/* Filled in by Diag Switch as pool blocks are

				 * filled */

	U16 VirtualProcessorNumber;

	U16 LogicalProcessorNumber;

	u16 VirtualProcessorNumber;

	u16 LogicalProcessorNumber;

	u8 ComponentType;	/* ULTRA_COMPONENT_TYPES */

	u8 Subsystem;

	U16 Reserved0;		/* pad to U64 alignment */

	u16 Reserved0;		/* pad to U64 alignment */

	U32 BlockNumber;	/* filled in by DiagSwitch as pool blocks are

				 * filled */

	U32 BlockNumberHigh;

drivers/staging/unisys/common-spar/include/channels/iochannel.h

+11 −11
Original line number Diff line number Diff line
@@ -289,7 +289,7 @@ struct uiscmdrsp_scsi { 
				 * send it back as is in the rsp packet.  */

	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)

	u16 guest_phys_entries;	/* Number of entries in scatter-gather (sg)

				 * list */

	struct guest_phys_info gpi_list[MAX_PHYS_INFO];	/* physical address

							 * information for each
@@ -491,7 +491,7 @@ struct net_pkt_xmt { 
				 * ignore */

		u8 hrawoffv;	/* 1 = hwrafoff is valid */

		u8 nhrawoffv;	/* 1 = nhwrafoff is valid */

		U16 protocol;	/* specifies packet protocol */

		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 */

		/* hrawoff points to the start of the TRANSPORT LAYER HEADER */
@@ -551,7 +551,7 @@ struct net_pkt_rcv { 


struct net_pkt_enbdis {

	void *context;

	U16 enable;		/* 1 = enable, 0 = disable */

	u16 enable;		/* 1 = enable, 0 = disable */

};



struct net_pkt_macaddr {
@@ -882,22 +882,22 @@ static inline int ULTRA_VNIC_init_channel(ULTRA_IO_CHANNEL_PROTOCOL *x, 
/* returns next non-zero index on success or zero on failure (i.e. out of

 * room)

 */

static INLINE  U16

static INLINE  u16

add_physinfo_entries(U32 inp_pfn,	/* input - specifies the pfn to be used

					 * to add entries */

		     U16 inp_off,	/* input - specifies the off to be used

		     u16 inp_off,	/* input - specifies the off to be used

					 * to add entries */

		     U32 inp_len,	/* input - specifies the len to be used

					 * to add entries */

		     U16 index,		/* input - index in array at which new

		     u16 index,		/* input - index in array at which new

					 * entries are added */

		     U16 max_pi_arr_entries,	/* input - specifies the maximum

		     u16 max_pi_arr_entries,	/* input - specifies the maximum

						 * entries pi_arr can hold */

		     struct phys_info pi_arr[]) /* input & output - array to

						  * which entries are added */

{

	U32 len;

	U16 i, firstlen;

	u16 i, firstlen;



	firstlen = PI_PAGE_SIZE - inp_off;

	if (inp_len <= firstlen) {
@@ -906,8 +906,8 @@ add_physinfo_entries(U32 inp_pfn, /* input - specifies the pfn to be used 
		if (index >= max_pi_arr_entries)

			return 0;

		pi_arr[index].pi_pfn = inp_pfn;

		pi_arr[index].pi_off = (U16) inp_off;

		pi_arr[index].pi_len = (U16) inp_len;

		pi_arr[index].pi_off = (u16) inp_off;

		pi_arr[index].pi_len = (u16) inp_len;

		    return index + 1;

	}
@@ -925,7 +925,7 @@ add_physinfo_entries(U32 inp_pfn, /* input - specifies the pfn to be used 
		else {

			pi_arr[index + i].pi_off = 0;

			pi_arr[index + i].pi_len =

			    (U16) MINNUM(len, (U32) PI_PAGE_SIZE);

			    (u16) MINNUM(len, (U32) PI_PAGE_SIZE);

		}



	}

drivers/staging/unisys/common-spar/include/vmcallinterface.h

+2 −2
Original line number Diff line number Diff line
@@ -101,8 +101,8 @@ do { \ 
#pragma pack(push, 1)

struct phys_info {

	U64 pi_pfn;

	U16 pi_off;

	U16 pi_len;

	u16 pi_off;

	u16 pi_len;

};



#pragma pack(pop)