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

staging: unisys: Fix ULTRA_VBUS_DEVICEINFO 



Remove the typedef from ULTRA_VBUS_DEVICEINFO and use struct
ultra_vbus_deviceinfo instead. Fix CamelCase member names:

devType => devtype
drvName => drvname
infoStrings => infostrs

Fix indentation on function definitions that were affected by the
structure's name change.

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

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

+6 −7
Original line number Diff line number Diff line
@@ -79,13 +79,12 @@ 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 */

	ULTRA_VBUS_DEVICEINFO ChpInfo;	/* describes client chipset device and

					 * driver */

	ULTRA_VBUS_DEVICEINFO BusInfo;	/* describes client bus device and

					 * driver */

	ULTRA_VBUS_DEVICEINFO DevInfo[0];	/* describes client device and

						 * driver for */

	/* each device on the bus */

	struct ultra_vbus_deviceinfo ChpInfo;

	/* describes client chipset device and driver */

	struct ultra_vbus_deviceinfo BusInfo;

	/* describes client bus device and driver */

	struct ultra_vbus_deviceinfo DevInfo[0];

	/* describes client device and driver for each device on the bus */

};



#define VBUS_CH_SIZE_EXACT(MAXDEVICES) \

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

+12 −12
Original line number Diff line number Diff line
@@ -25,13 +25,13 @@ 
 * It is filled in by the client side to provide info about the device

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

struct ultra_vbus_deviceinfo {

	u8 devtype[16];		/* short string identifying the device type */

	u8 drvname[16];		/* driver .sys file name */

	u8 infostrs[96];	/* sequence of tab-delimited id strings: */

	/* <DRIVER_REV> <DRIVER_VERTAG> <DRIVER_COMPILETIME> */

	u8 reserved[128];	/* pad size to 256 bytes */

} ULTRA_VBUS_DEVICEINFO;

};



#pragma pack(pop)
@@ -147,15 +147,15 @@ vbuschannel_itoa(char *p, int remain, int num) 
 * Returns the number of bytes written to <p>.

 */

static inline int

vbuschannel_devinfo_to_string(ULTRA_VBUS_DEVICEINFO *devinfo,

vbuschannel_devinfo_to_string(struct ultra_vbus_deviceinfo *devinfo,

				  char *p, int remain, int devix)

{

	char *psrc;

	int nsrc, x, i, pad;

	int chars = 0;



	psrc = &(devinfo->devType[0]);

	nsrc = sizeof(devinfo->devType);

	psrc = &(devinfo->devtype[0]);

	nsrc = sizeof(devinfo->devtype);

	if (vbuschannel_sanitize_buffer(NULL, 0, psrc, nsrc) <= 0)

		return 0;
@@ -184,8 +184,8 @@ vbuschannel_devinfo_to_string(ULTRA_VBUS_DEVICEINFO *devinfo, 
	VBUSCHANNEL_ADDACHAR(' ', p, remain, chars);



	/* emit driver name */

	psrc = &(devinfo->drvName[0]);

	nsrc = sizeof(devinfo->drvName);

	psrc = &(devinfo->drvname[0]);

	nsrc = sizeof(devinfo->drvname);

	x = vbuschannel_sanitize_buffer(p, remain, psrc, nsrc);

	p += x;

	remain -= x;
@@ -196,8 +196,8 @@ vbuschannel_devinfo_to_string(ULTRA_VBUS_DEVICEINFO *devinfo, 
	VBUSCHANNEL_ADDACHAR(' ', p, remain, chars);



	/* emit strings */

	psrc = &(devinfo->infoStrings[0]);

	nsrc = sizeof(devinfo->infoStrings);

	psrc = &(devinfo->infostrs[0]);

	nsrc = sizeof(devinfo->infostrs);

	x = vbuschannel_sanitize_buffer(p, remain, psrc, nsrc);

	p += x;

	remain -= x;

drivers/staging/unisys/include/uisutils.h

+11 −11
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ int uisutil_add_proc_line_ex(int *total, char **buffer, int *buffer_remaining, 
			     char *format, ...);



int uisctrl_register_req_handler(int type, void *fptr,

				 ULTRA_VBUS_DEVICEINFO *chipset_driver_info);

			struct ultra_vbus_deviceinfo *chipset_driver_info);

int uisctrl_register_req_handler_ex(uuid_le switch_guid,

			const char *switch_type_name,

			int (*fptr)(struct io_msgs *),
@@ -125,7 +125,7 @@ int uisctrl_register_req_handler_ex(uuid_le switch_guid, 
						unsigned char *client_str,

						u32 client_str_len,

						u64 bytes),

				    ULTRA_VBUS_DEVICEINFO *chipset_driver_info);

			struct ultra_vbus_deviceinfo *chipset_driver_info);



int uisctrl_unregister_req_handler_ex(uuid_le switch_uuid);

unsigned char *util_map_virt(struct phys_info *sg);

drivers/staging/unisys/include/vbushelper.h

+8 −8
Original line number Diff line number Diff line
@@ -26,19 +26,19 @@ 
#define TARGET_HOSTNAME "linuxguest"



static inline void bus_device_info_init(

		ULTRA_VBUS_DEVICEINFO * bus_device_info_ptr,

		struct ultra_vbus_deviceinfo *bus_device_info_ptr,

		const char *dev_type, const char *drv_name,

		const char *ver, const char *ver_tag)

{

	memset(bus_device_info_ptr, 0, sizeof(ULTRA_VBUS_DEVICEINFO));

	snprintf(bus_device_info_ptr->devType,

		 sizeof(bus_device_info_ptr->devType),

	memset(bus_device_info_ptr, 0, sizeof(struct ultra_vbus_deviceinfo));

	snprintf(bus_device_info_ptr->devtype,

		 sizeof(bus_device_info_ptr->devtype),

		 "%s", (dev_type) ? dev_type : "unknownType");

	snprintf(bus_device_info_ptr->drvName,

		 sizeof(bus_device_info_ptr->drvName),

	snprintf(bus_device_info_ptr->drvname,

		 sizeof(bus_device_info_ptr->drvname),

		 "%s", (drv_name) ? drv_name : "unknownDriver");

	snprintf(bus_device_info_ptr->infoStrings,

		 sizeof(bus_device_info_ptr->infoStrings), "%s\t%s\t%s",

	snprintf(bus_device_info_ptr->infostrs,

		 sizeof(bus_device_info_ptr->infostrs), "%s\t%s\t%s",

		 (ver) ? ver : "unknownVer",

		 (ver_tag) ? ver_tag : "unknownVerTag",

		 TARGET_HOSTNAME);

drivers/staging/unisys/uislib/uisutils.c

+7 −8
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ EXPORT_SYMBOL_GPL(uisutil_add_proc_line_ex); 


int

uisctrl_register_req_handler(int type, void *fptr,

			     ULTRA_VBUS_DEVICEINFO *chipset_driver_info)

			     struct ultra_vbus_deviceinfo *chipset_driver_info)

{

	LOGINF("type = %d, fptr = 0x%p.\n", type, fptr);
@@ -109,12 +109,11 @@ uisctrl_register_req_handler_ex(uuid_le switch_uuid, 
			const char *switch_type_name,

			int (*controlfunc)(struct io_msgs *),

			unsigned long min_channel_bytes,

				int (*server_channel_ok)(unsigned long

							  channel_bytes),

			int (*server_channel_ok)(unsigned long channel_bytes),

			int (*server_channel_init)(void *x,

						unsigned char *client_str,

						u32 client_str_len, u64 bytes),

				ULTRA_VBUS_DEVICEINFO *chipset_driver_info)

			struct ultra_vbus_deviceinfo *chipset_driver_info)

{

	struct req_handler_info *pReqHandlerInfo;

	int rc = 0;		/* assume failure */