staging: unisys: remove typedef ReqHandlerInfo_t

Convert all references to the typedef to struct req_handler_info.

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/unisys/include/uisutils.h b/drivers/staging/unisys/include/uisutils.h
index 0dee798ad4e0463b5e0e26263316d7f7317421d4..9bb95d597d5c6f8200b6c8c97ab198abc0295d31 100644 (file)
--- a/drivers/staging/unisys/include/uisutils.h
+++ b/drivers/staging/unisys/include/uisutils.h
@@ -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,
-                                 u32 clientStrLen, u64 bytes));
-ReqHandlerInfo_t *ReqHandlerFind(uuid_le switchTypeGuid);
+                               int (*Server_Channel_Init)(void *x,
+                                               unsigned char *clientStr,
+                                               u32 clientStrLen, u64 bytes));
+struct req_handler_info *ReqHandlerFind(uuid_le switchTypeGuid);
 int ReqHandlerDel(uuid_le switchTypeGuid);
 
 #define uislib_ioremap_cache(addr, size) \

diff --git a/drivers/staging/unisys/uislib/uislib.c b/drivers/staging/unisys/uislib/uislib.c
index b1c9d4942cd6a69affc54af7b46360af97da6864..c438d8334e2359e5a7fa5adc353b946d6870629b 100644 (file)
--- a/drivers/staging/unisys/uislib/uislib.c
+++ b/drivers/staging/unisys/uislib/uislib.c
@@ -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;

diff --git a/drivers/staging/unisys/uislib/uisutils.c b/drivers/staging/unisys/uislib/uisutils.c
index 82230f2c61ae29eb886a395bddeddcdbd6c1a095..f3a23a62d6fe99de7416b7d3a197ad145b00d194 100644 (file)
--- a/drivers/staging/unisys/uislib/uisutils.c
+++ b/drivers/staging/unisys/uislib/uisutils.c
@@ -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);