staging: unisys: remove unneeded functions
authorSudip Mukherjee <sudipm.mukherjee@gmail.com>
Thu, 12 Feb 2015 12:23:35 +0000 (17:53 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 27 Feb 2015 01:20:25 +0000 (17:20 -0800)
these functions are not being used anywhere.so we can remove them.
has been verified by "git grep" that they are not being referenced
anywhere also has been build tested.

Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/unisys/include/uisutils.h
drivers/staging/unisys/uislib/uisutils.c

index 7414220676d3d9c3aeb5e3ebb05916d53d1762c1..e2dfb2e784de03434a980b25e6ff1aabf1b93c22 100644 (file)
@@ -65,17 +65,7 @@ struct req_handler_info {
        struct list_head list_link;     /* links into ReqHandlerInfo_list */
 };
 
-struct req_handler_info *req_handler_add(uuid_le switch_uuid,
-                               const char *switch_type_name,
-                               int (*controlfunc)(struct io_msgs *),
-                               unsigned long min_channel_bytes,
-                               int (*svr_channel_ok)(unsigned long
-                                                        channel_bytes),
-                               int (*svr_channel_init)(void *x,
-                                               unsigned char *client_str,
-                                               u32 client_str_len, u64 bytes));
 struct req_handler_info *req_handler_find(uuid_le switch_uuid);
-int req_handler_del(uuid_le switch_uuid);
 
 #define uislib_ioremap_cache(addr, size) \
        dbg_ioremap_cache(addr, size, __FILE__, __LINE__)
@@ -115,19 +105,7 @@ int uisutil_add_proc_line_ex(int *total, char **buffer, int *buffer_remaining,
 
 int uisctrl_register_req_handler(int type, void *fptr,
                        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 *),
-                       unsigned long min_channel_bytes,
-                       int (*svr_channel_ok)(unsigned long
-                                             channel_bytes),
-                       int (*svr_channel_init)(void *x,
-                                               unsigned char *client_str,
-                                               u32 client_str_len,
-                                               u64 bytes),
-                       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);
 void util_unmap_virt(struct phys_info *sg);
 unsigned char *util_map_virt_atomic(struct phys_info *sg);
@@ -212,15 +190,6 @@ wait_for_valid_guid(uuid_le __iomem *guid)
        LOGERR("OK... GUID is non-0 now\n");
 }
 
-/* CopyFragsInfoFromSkb returns the number of entries added to frags array
- * Returns -1 on failure.
- */
-unsigned int uisutil_copy_fragsinfo_from_skb(unsigned char *calling_ctx,
-                                            void *skb_in,
-                                            unsigned int firstfraglen,
-                                            unsigned int frags_max,
-                                            struct phys_info frags[]);
-
 static inline unsigned int
 issue_vmcall_io_controlvm_addr(u64 *control_addr, u32 *control_bytes)
 {
index 31318d246252981189ebeea753889313bcc16419..1ba6c15bcbe097bd9ff1715448fafa29aa57a19d 100644 (file)
@@ -102,71 +102,6 @@ uisctrl_register_req_handler(int type, void *fptr,
 }
 EXPORT_SYMBOL_GPL(uisctrl_register_req_handler);
 
-int
-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_init)(void *x,
-                                               unsigned char *client_str,
-                                               u32 client_str_len, u64 bytes),
-                       struct ultra_vbus_deviceinfo *chipset_driver_info)
-{
-       struct req_handler_info *req_handler;
-
-       LOGINF("type=%pUL, controlfunc=0x%p.\n",
-              &switch_uuid, controlfunc);
-       if (!controlfunc) {
-               LOGERR("%pUL: controlfunc must be supplied\n", &switch_uuid);
-               return 0;
-       }
-       if (!server_channel_ok) {
-               LOGERR("%pUL: Server_Channel_Ok must be supplied\n",
-                               &switch_uuid);
-               return 0;
-       }
-       if (!server_channel_init) {
-               LOGERR("%pUL: Server_Channel_Init must be supplied\n",
-                               &switch_uuid);
-               return 0;
-       }
-       req_handler = req_handler_add(switch_uuid,
-                                     switch_type_name,
-                                     controlfunc,
-                                     min_channel_bytes,
-                                     server_channel_ok, server_channel_init);
-       if (!req_handler) {
-               LOGERR("failed to add %pUL to server list\n", &switch_uuid);
-               return 0;
-       }
-
-       atomic_inc(&uisutils_registered_services);
-       if (chipset_driver_info) {
-               bus_device_info_init(chipset_driver_info, "chipset",
-                                    "uislib", VERSION, NULL);
-               return 1;
-       }
-
-       LOGERR("failed to register type %pUL.\n", &switch_uuid);
-       return 0;
-}
-EXPORT_SYMBOL_GPL(uisctrl_register_req_handler_ex);
-
-int
-uisctrl_unregister_req_handler_ex(uuid_le switch_uuid)
-{
-       LOGINF("type=%pUL.\n", &switch_uuid);
-       if (req_handler_del(switch_uuid) < 0) {
-               LOGERR("failed to remove %pUL from server list\n",
-                      &switch_uuid);
-               return 0;
-       }
-       atomic_dec(&uisutils_registered_services);
-       return 1;
-}
-EXPORT_SYMBOL_GPL(uisctrl_unregister_req_handler_ex);
-
 /*
  * unsigned int uisutil_copy_fragsinfo_from_skb(unsigned char *calling_ctx,
  *                                          void *skb_in,
@@ -185,116 +120,10 @@ EXPORT_SYMBOL_GPL(uisctrl_unregister_req_handler_ex);
  *                                         return value indicates number of
  *                                         entries filled in frags
  */
-unsigned int
-uisutil_copy_fragsinfo_from_skb(unsigned char *calling_ctx, void *skb_in,
-                               unsigned int firstfraglen,
-                               unsigned int frags_max,
-                               struct phys_info frags[])
-{
-       unsigned int count = 0, ii, size, offset = 0, numfrags;
-       struct sk_buff *skb = skb_in;
-
-       numfrags = skb_shinfo(skb)->nr_frags;
-
-       while (firstfraglen) {
-               if (count == frags_max) {
-                       LOGERR("%s frags array too small: max:%d count:%d\n",
-                              calling_ctx, frags_max, count);
-                       return -1;      /* failure */
-               }
-               frags[count].pi_pfn =
-                   page_to_pfn(virt_to_page(skb->data + offset));
-               frags[count].pi_off =
-                   (unsigned long)(skb->data + offset) & PI_PAGE_MASK;
-               size =
-                   min(firstfraglen,
-                       (unsigned int)(PI_PAGE_SIZE - frags[count].pi_off));
-               /* can take smallest of firstfraglen(what's left) OR
-               * bytes left in the page
-               */
-               frags[count].pi_len = size;
-               firstfraglen -= size;
-               offset += size;
-               count++;
-       }
-       if (!numfrags)
-               goto dolist;
-
-       if ((count + numfrags) > frags_max) {
-               LOGERR("**** FAILED %s frags array too small: max:%d count+nr_frags:%d\n",
-                      calling_ctx, frags_max, count + numfrags);
-               return -1;      /* failure */
-       }
-
-       for (ii = 0; ii < numfrags; ii++) {
-               count = add_physinfo_entries(page_to_pfn(
-                               skb_frag_page(&skb_shinfo(skb)->frags[ii])),
-                                       skb_shinfo(skb)->frags[ii].
-                                       page_offset,
-                                       skb_shinfo(skb)->frags[ii].
-                                       size, count, frags_max,
-                                       frags);
-               if (count == 0) {
-                       LOGERR("**** FAILED to add physinfo entries\n");
-                       return -1;      /* failure */
-               }
-       }
-
-dolist: if (skb_shinfo(skb)->frag_list) {
-               struct sk_buff *skbinlist;
-               int c;
-
-               for (skbinlist = skb_shinfo(skb)->frag_list; skbinlist;
-                    skbinlist = skbinlist->next) {
-                       c = uisutil_copy_fragsinfo_from_skb("recursive",
-                               skbinlist,
-                               skbinlist->len - skbinlist->data_len,
-                               frags_max - count,
-                               &frags[count]);
-                       if (c == -1) {
-                               LOGERR("**** FAILED recursive call failed\n");
-                               return -1;
-                       }
-                       count += c;
-               }
-       }
-       return count;
-}
-EXPORT_SYMBOL_GPL(uisutil_copy_fragsinfo_from_skb);
 
 static LIST_HEAD(req_handler_info_list); /* list of struct req_handler_info */
 static DEFINE_SPINLOCK(req_handler_info_list_lock);
 
-struct req_handler_info *
-req_handler_add(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_init)
-              (void *x, unsigned char *clientstr, u32 clientstr_len,
-               u64 bytes))
-{
-       struct req_handler_info *rc = NULL;
-
-       rc = kzalloc(sizeof(*rc), GFP_ATOMIC);
-       if (!rc)
-               return NULL;
-       rc->switch_uuid = switch_uuid;
-       rc->controlfunc = controlfunc;
-       rc->min_channel_bytes = min_channel_bytes;
-       rc->server_channel_ok = server_channel_ok;
-       rc->server_channel_init = server_channel_init;
-       if (switch_type_name)
-               strncpy(rc->switch_type_name, switch_type_name,
-                       sizeof(rc->switch_type_name) - 1);
-       spin_lock(&req_handler_info_list_lock);
-       list_add_tail(&rc->list_link, &req_handler_info_list);
-       spin_unlock(&req_handler_info_list_lock);
-
-       return rc;
-}
-
 struct req_handler_info *
 req_handler_find(uuid_le switch_uuid)
 {
@@ -312,23 +141,3 @@ req_handler_find(uuid_le switch_uuid)
        spin_unlock(&req_handler_info_list_lock);
        return NULL;
 }
-
-int
-req_handler_del(uuid_le switch_uuid)
-{
-       struct list_head *lelt, *tmp;
-       struct req_handler_info *entry = NULL;
-       int rc = -1;
-
-       spin_lock(&req_handler_info_list_lock);
-       list_for_each_safe(lelt, tmp, &req_handler_info_list) {
-               entry = list_entry(lelt, struct req_handler_info, list_link);
-               if (uuid_le_cmp(entry->switch_uuid, switch_uuid) == 0) {
-                       list_del(lelt);
-                       kfree(entry);
-                       rc++;
-               }
-       }
-       spin_unlock(&req_handler_info_list_lock);
-       return rc;
-}