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

staging: unisys: remove typedef ReqHandlerInfo_t 



Convert all references to the typedef to struct req_handler_info.

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

drivers/staging/unisys/include/uisutils.h

+7 −7
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ extern int (*virt_control_chan_func)(struct guest_msgs *); 
#define CCF_PENDING      2	/* operation still pending */

extern atomic_t uisutils_registered_services;



typedef struct ReqHandlerInfo_struct {

struct req_handler_info {

	uuid_le switchTypeGuid;

	int (*controlfunc)(struct io_msgs *);

	unsigned long min_channel_bytes;
@@ -63,18 +63,18 @@ typedef struct ReqHandlerInfo_struct { 
	 (void *x, unsigned char *clientStr, u32 clientStrLen, u64 bytes);

	char switch_type_name[99];

	struct list_head list_link;	/* links into ReqHandlerInfo_list */

} ReqHandlerInfo_t;

};



ReqHandlerInfo_t *ReqHandlerAdd(uuid_le switchTypeGuid,

struct req_handler_info *ReqHandlerAdd(uuid_le switchTypeGuid,

				const char *switch_type_name,

				int (*controlfunc)(struct io_msgs *),

				unsigned long min_channel_bytes,

				int (*Server_Channel_Ok)(unsigned long

							 channelBytes),

				int (*Server_Channel_Init)

				 (void *x, unsigned char *clientStr,

				int (*Server_Channel_Init)(void *x,

						unsigned char *clientStr,

						u32 clientStrLen, u64 bytes));

ReqHandlerInfo_t *ReqHandlerFind(uuid_le switchTypeGuid);

struct req_handler_info *ReqHandlerFind(uuid_le switchTypeGuid);

int ReqHandlerDel(uuid_le switchTypeGuid);



#define uislib_ioremap_cache(addr, size) \

drivers/staging/unisys/uislib/uislib.c

+1 −1
Original line number Diff line number Diff line
@@ -352,7 +352,7 @@ create_device(CONTROLVM_MESSAGE *msg, char *buf) 
	u32 busNo, devNo;

	int result = CONTROLVM_RESP_SUCCESS;

	u64 minSize = MIN_IO_CHANNEL_SIZE;

	ReqHandlerInfo_t *pReqHandler;

	struct req_handler_info *pReqHandler;



	busNo = msg->cmd.createDevice.busNo;

	devNo = msg->cmd.createDevice.devNo;

drivers/staging/unisys/uislib/uisutils.c

+9 −9
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ uisctrl_register_req_handler_ex(uuid_le switchTypeGuid, 
				  u32 clientStrLen, u64 bytes),

				ULTRA_VBUS_DEVICEINFO *chipset_DriverInfo)

{

	ReqHandlerInfo_t *pReqHandlerInfo;

	struct req_handler_info *pReqHandlerInfo;

	int rc = 0;		/* assume failure */



	LOGINF("type=%pUL, controlfunc=0x%p.\n",
@@ -275,10 +275,10 @@ dolist: if (skb_shinfo(skb)->frag_list) { 
}

EXPORT_SYMBOL_GPL(uisutil_copy_fragsinfo_from_skb);



static LIST_HEAD(ReqHandlerInfo_list);	/* list of ReqHandlerInfo_t */

static LIST_HEAD(ReqHandlerInfo_list);	/* list of struct req_handler_info */

static DEFINE_SPINLOCK(ReqHandlerInfo_list_lock);



ReqHandlerInfo_t *

struct req_handler_info *

ReqHandlerAdd(uuid_le switchTypeGuid,

	      const char *switch_type_name,

	      int (*controlfunc)(struct io_msgs *),
@@ -287,7 +287,7 @@ ReqHandlerAdd(uuid_le switchTypeGuid, 
	      int (*Server_Channel_Init)

	       (void *x, unsigned char *clientStr, u32 clientStrLen, u64 bytes))

{

	ReqHandlerInfo_t *rc = NULL;

	struct req_handler_info *rc = NULL;



	rc = kzalloc(sizeof(*rc), GFP_ATOMIC);

	if (!rc)
@@ -307,15 +307,15 @@ ReqHandlerAdd(uuid_le switchTypeGuid, 
	return rc;

}



ReqHandlerInfo_t *

struct req_handler_info *

ReqHandlerFind(uuid_le switchTypeGuid)

{

	struct list_head *lelt, *tmp;

	ReqHandlerInfo_t *entry = NULL;

	struct req_handler_info *entry = NULL;



	spin_lock(&ReqHandlerInfo_list_lock);

	list_for_each_safe(lelt, tmp, &ReqHandlerInfo_list) {

		entry = list_entry(lelt, ReqHandlerInfo_t, list_link);

		entry = list_entry(lelt, struct req_handler_info, list_link);

		if (uuid_le_cmp(entry->switchTypeGuid, switchTypeGuid) == 0) {

			spin_unlock(&ReqHandlerInfo_list_lock);

			return entry;
@@ -329,12 +329,12 @@ int 
ReqHandlerDel(uuid_le switchTypeGuid)

{

	struct list_head *lelt, *tmp;

	ReqHandlerInfo_t *entry = NULL;

	struct req_handler_info *entry = NULL;

	int rc = -1;



	spin_lock(&ReqHandlerInfo_list_lock);

	list_for_each_safe(lelt, tmp, &ReqHandlerInfo_list) {

		entry = list_entry(lelt, ReqHandlerInfo_t, list_link);

		entry = list_entry(lelt, struct req_handler_info, list_link);

		if (uuid_le_cmp(entry->switchTypeGuid, switchTypeGuid) == 0) {

			list_del(lelt);

			kfree(entry);