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

staging: unisys: remove typedef SIGNAL_QUEUE_HEADER 



Get rid of the typedef for SIGNAL_QUEUE_HEADER and use struct
signal_queue_header directly instead. Fix all references to the typedef
to use the struct.

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

drivers/staging/unisys/channels/channel.c

+8 −8
Original line number Diff line number Diff line
@@ -50,8 +50,8 @@ visor_signal_insert(struct channel_header __iomem *pChannel, u32 Queue, 
	void __iomem *psignal;

	unsigned int head, tail, nof;



	SIGNAL_QUEUE_HEADER __iomem *pqhdr =

	    (SIGNAL_QUEUE_HEADER __iomem *)

	struct signal_queue_header __iomem *pqhdr =

	    (struct signal_queue_header __iomem *)

		((char __iomem *) pChannel + readq(&pChannel->ch_space_offset))

		+ Queue;
@@ -108,8 +108,8 @@ visor_signal_remove(struct channel_header __iomem *pChannel, u32 Queue, 
{

	void __iomem *psource;

	unsigned int head, tail;

	SIGNAL_QUEUE_HEADER __iomem *pqhdr =

	    (SIGNAL_QUEUE_HEADER __iomem *) ((char __iomem *) pChannel +

	struct signal_queue_header __iomem *pqhdr =

	    (struct signal_queue_header __iomem *) ((char __iomem *) pChannel +

				    readq(&pChannel->ch_space_offset)) + Queue;



	/* capture current head and tail */
@@ -163,8 +163,8 @@ SignalRemoveAll(struct channel_header *pChannel, u32 Queue, void *pSignal) 
{

	void *psource;

	unsigned int head, tail, signalCount = 0;

	pSIGNAL_QUEUE_HEADER pqhdr =

	    (pSIGNAL_QUEUE_HEADER) ((char *) pChannel +

	struct signal_queue_header *pqhdr =

	    (struct signal_queue_header *) ((char *) pChannel +

				    pChannel->ch_space_offset) + Queue;



	/* capture current head and tail */
@@ -212,8 +212,8 @@ SignalRemoveAll(struct channel_header *pChannel, u32 Queue, void *pSignal) 
unsigned char

visor_signalqueue_empty(struct channel_header __iomem *pChannel, u32 Queue)

{

	SIGNAL_QUEUE_HEADER __iomem *pqhdr =

	    (SIGNAL_QUEUE_HEADER __iomem *) ((char __iomem *) pChannel +

	struct signal_queue_header __iomem *pqhdr =

	    (struct signal_queue_header __iomem *) ((char __iomem *) pChannel +

				    readq(&pChannel->ch_space_offset)) + Queue;

	return readl(&pqhdr->Head) == readl(&pqhdr->Tail);

}

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

+2 −2
Original line number Diff line number Diff line
@@ -232,7 +232,7 @@ struct channel_header { 
#define ULTRA_CHANNEL_ENABLE_INTS (0x1ULL << 0)



/* Subheader for the Signal Type variation of the Common Channel */

typedef struct _SIGNAL_QUEUE_HEADER {

struct signal_queue_header {

	/* 1st cache line */

	u32 VersionId;		/* SIGNAL_QUEUE_HEADER Version ID */

	u32 Type;		/* Queue type: storage, network */
@@ -265,7 +265,7 @@ typedef struct _SIGNAL_QUEUE_HEADER { 
				 * to denote trouble with client's

				 * fields */

	u8 Filler[12];		/* Pad out to 64 byte cacheline */

} SIGNAL_QUEUE_HEADER, *pSIGNAL_QUEUE_HEADER;

};



#pragma pack(pop)

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

+4 −4
Original line number Diff line number Diff line
@@ -542,16 +542,16 @@ typedef struct _ULTRA_CONTROLVM_CHANNEL_PROTOCOL { 
	u32 SPReserved;

	u8 Reserved2[28];	/* Force signals to begin on 128-byte cache

				 * line */

	SIGNAL_QUEUE_HEADER RequestQueue;	/* Service or guest partition

	struct signal_queue_header RequestQueue;/* Service or guest partition

						 * uses this queue to send

						 * requests to Control */

	SIGNAL_QUEUE_HEADER ResponseQueue;	/* Control uses this queue to

	struct signal_queue_header ResponseQueue;/* Control uses this queue to

						 * respond to service or guest

						 * partition requests */

	SIGNAL_QUEUE_HEADER EventQueue;		/* Control uses this queue to

	struct signal_queue_header EventQueue;	/* Control uses this queue to

						 * send events to service or

						 * guest partition */

	SIGNAL_QUEUE_HEADER EventAckQueue;	/* Service or guest partition

	struct signal_queue_header EventAckQueue;/* Service or guest partition

						 * uses this queue to ack

						 * Control events */

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

+2 −2
Original line number Diff line number Diff line
@@ -384,7 +384,7 @@ typedef struct _DIAG_CHANNEL_PROTOCOL_HEADER { 


/* Offsets/sizes for diagnostic channel attributes... */

#define DIAG_CH_QUEUE_HEADER_OFFSET (sizeof(struct channel_header))

#define DIAG_CH_QUEUE_HEADER_SIZE (sizeof(SIGNAL_QUEUE_HEADER))

#define DIAG_CH_QUEUE_HEADER_SIZE (sizeof(struct signal_queue_header))

#define DIAG_CH_PROTOCOL_HEADER_OFFSET \

	(DIAG_CH_QUEUE_HEADER_OFFSET + DIAG_CH_QUEUE_HEADER_SIZE)

#define DIAG_CH_PROTOCOL_HEADER_SIZE (sizeof(DIAG_CHANNEL_PROTOCOL_HEADER))
@@ -417,7 +417,7 @@ typedef struct _DIAG_CHANNEL_PROTOCOL_HEADER { 
*/

typedef struct _ULTRA_DIAG_CHANNEL_PROTOCOL  {

	struct channel_header CommonChannelHeader;

	SIGNAL_QUEUE_HEADER QueueHeader;

	struct signal_queue_header QueueHeader;

	DIAG_CHANNEL_PROTOCOL_HEADER DiagChannelHeader;

	DIAG_CHANNEL_EVENT Events[(DIAG_CH_SIZE - DIAG_CH_EVENT_OFFSET) /

				   sizeof(DIAG_CHANNEL_EVENT)];

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

+2 −2
Original line number Diff line number Diff line
@@ -686,8 +686,8 @@ struct uiscmdrsp { 
* response queues as specified in cmdQ and rspQ SIGNAL_QUEUE_HEADERS. */

typedef struct _ULTRA_IO_CHANNEL_PROTOCOL {

	struct channel_header ChannelHeader;

	SIGNAL_QUEUE_HEADER cmdQ;

	SIGNAL_QUEUE_HEADER rspQ;

	struct signal_queue_header cmdQ;

	struct signal_queue_header rspQ;

	union {

		struct {

			struct vhba_wwnn wwnn;	/* 8 bytes */