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

staging: unisys: fix typedef of ULTRA_VBUS_CHANNEL_PROTOCOL 



Get rid of the typedef ULTRA_VBUS_CHANNEL_PROTOCOL, in favor of the name
struct ultra_vbus_channel_protocol. This change finishes the warnings
clean up for include/uisqueue.h.

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

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

+4 −4
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ static const uuid_le UltraVbusChannelProtocolGuid = 
	(ULTRA_check_channel_client(pChannel,				\

				    UltraVbusChannelProtocolGuid,	\

				    "vbus",				\

				    sizeof(ULTRA_VBUS_CHANNEL_PROTOCOL), \

				    sizeof(struct ultra_vbus_channel_protocol),\

				    ULTRA_VBUS_CHANNEL_PROTOCOL_VERSIONID, \

				    ULTRA_VBUS_CHANNEL_PROTOCOL_SIGNATURE, \

				    __FILE__, __LINE__, logCtx))
@@ -55,7 +55,7 @@ static const uuid_le UltraVbusChannelProtocolGuid = 
#define ULTRA_VBUS_CHANNEL_OK_SERVER(actualBytes, logCtx)    \

	(ULTRA_check_channel_server(UltraVbusChannelProtocolGuid,	\

				    "vbus",				\

				    sizeof(ULTRA_VBUS_CHANNEL_PROTOCOL), \

				    sizeof(struct ultra_vbus_channel_protocol),\

				    actualBytes,			\

				    __FILE__, __LINE__, logCtx))
@@ -75,7 +75,7 @@ typedef struct _ULTRA_VBUS_HEADERINFO { 
	u8 reserved[104];

} ULTRA_VBUS_HEADERINFO;



typedef struct _ULTRA_VBUS_CHANNEL_PROTOCOL {

struct ultra_vbus_channel_protocol {

	ULTRA_CHANNEL_PROTOCOL ChannelHeader;	/* initialized by server */

	ULTRA_VBUS_HEADERINFO HdrInfo;	/* initialized by server */

	/* the remainder of this channel is filled in by the client */
@@ -86,7 +86,7 @@ typedef struct _ULTRA_VBUS_CHANNEL_PROTOCOL { 
	ULTRA_VBUS_DEVICEINFO DevInfo[0];	/* describes client device and

						 * driver for */

	/* each device on the bus */

} ULTRA_VBUS_CHANNEL_PROTOCOL;

};



#define VBUS_CH_SIZE_EXACT(MAXDEVICES) \

	(sizeof(ULTRA_VBUS_CHANNEL_PROTOCOL) + ((MAXDEVICES) * \

drivers/staging/unisys/include/uisqueue.h

+1 −1
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ struct bus_info { 
	struct device_info **device;

	u64 guest_handle, recv_bus_irq_handle;

	uuid_le bus_inst_uuid;

	ULTRA_VBUS_CHANNEL_PROTOCOL __iomem *bus_channel;

	struct ultra_vbus_channel_protocol __iomem *bus_channel;

	int bus_channel_bytes;

	struct proc_dir_entry *proc_dir;	/* proc/uislib/vbus/<x> */

	struct proc_dir_entry *proc_info;	/* proc/uislib/vbus/<x>/info */

drivers/staging/unisys/virtpci/virtpci.c

+3 −3
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ int WAIT_FOR_IO_CHANNEL(ULTRA_IO_CHANNEL_PROTOCOL __iomem *chanptr) 
}



/* Write the contents of <info> to the ULTRA_VBUS_CHANNEL_PROTOCOL.ChpInfo. */

static int write_vbus_chpInfo(ULTRA_VBUS_CHANNEL_PROTOCOL *chan,

static int write_vbus_chpInfo(struct ultra_vbus_channel_protocol *chan,

			      ULTRA_VBUS_DEVICEINFO *info)

{

	int off;
@@ -205,7 +205,7 @@ static int write_vbus_chpInfo(ULTRA_VBUS_CHANNEL_PROTOCOL *chan, 
}



/* Write the contents of <info> to the ULTRA_VBUS_CHANNEL_PROTOCOL.BusInfo. */

static int write_vbus_busInfo(ULTRA_VBUS_CHANNEL_PROTOCOL *chan,

static int write_vbus_busInfo(struct ultra_vbus_channel_protocol *chan,

			      ULTRA_VBUS_DEVICEINFO *info)

{

	int off;
@@ -227,7 +227,7 @@ static int write_vbus_busInfo(ULTRA_VBUS_CHANNEL_PROTOCOL *chan, 
 * ULTRA_VBUS_CHANNEL_PROTOCOL.DevInfo[<devix>].

 */

static int

write_vbus_devInfo(ULTRA_VBUS_CHANNEL_PROTOCOL *chan,

write_vbus_devInfo(struct ultra_vbus_channel_protocol *chan,

		   ULTRA_VBUS_DEVICEINFO *info, int devix)

{

	int off;