staging: wilc1000: Remove useless function

GCC warns that 'wid' is unused in wilc_remove_key and it's correct; the
variable is only local. Get rid of the function (since it just returns
zero) and shuffle the remaining code into one if statement.

Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 3fd4c8e62da6529e98ee5e27e7253e8a320acd28..b5f3829e9903b34cfb56420b1c40b09b76b697b4 100644 (file)
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -2606,18 +2606,6 @@ static void timer_connect_cb(struct timer_list *t)
        wilc_enqueue_cmd(&msg);
 }
 
-s32 wilc_remove_key(struct host_if_drv *hif_drv, const u8 *sta_addr)
-{
-       struct wid wid;
-
-       wid.id = (u16)WID_REMOVE_KEY;
-       wid.type = WID_STR;
-       wid.val = (s8 *)sta_addr;
-       wid.size = 6;
-
-       return 0;
-}
-
 int wilc_remove_wep_key(struct wilc_vif *vif, u8 index)
 {
        int result = 0;

diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h
index 7a26f341e0ba8715911dc9f4cd5c1e98df44f2bc..08b3ba7df8b49a72d8fc43094362fd11ddb71862 100644 (file)
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -303,7 +303,6 @@ struct add_sta_param {
 };
 
 struct wilc_vif;
-s32 wilc_remove_key(struct host_if_drv *hif_drv, const u8 *sta_addr);
 int wilc_remove_wep_key(struct wilc_vif *vif, u8 index);
 int wilc_set_wep_default_keyid(struct wilc_vif *vif, u8 index);
 int wilc_add_wep_key_bss_sta(struct wilc_vif *vif, const u8 *key, u8 len,

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 76b4afaef42316f7f19b0990311af7a64dcc9eb8..b499fb987395e8c53ede15b1d3a9aa3698cf6dfd 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -1054,15 +1054,11 @@ static int del_key(struct wiphy *wiphy, struct net_device *netdev,
                }
        }
 
-       if (key_index >= 0 && key_index <= 3) {
-               if (priv->wep_key_len[key_index]) {
-                       memset(priv->wep_key[key_index], 0,
-                              priv->wep_key_len[key_index]);
-                       priv->wep_key_len[key_index] = 0;
-                       wilc_remove_wep_key(vif, key_index);
-               }
-       } else {
-               wilc_remove_key(priv->hif_drv, mac_addr);
+       if (key_index >= 0 && key_index <= 3 && priv->wep_key_len[key_index]) {
+               memset(priv->wep_key[key_index], 0,
+                      priv->wep_key_len[key_index]);
+               priv->wep_key_len[key_index] = 0;
+               wilc_remove_wep_key(vif, key_index);
        }
 
        return 0;