staging: wilc1000: replace sem_test_key_block with a completion

    Semaphore sem_test_key_block is used to signal completion of its
    host interface message. Since the thread locking this semaphore will
    have to wait, completions are the preferred mechanism and will offer
    a performance improvement.

Signed-off-by: Alison Schofield <amsfield22@gmail.com>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Tested-by: Leo Kim <leo.kim@atmel.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 ed7f011..f50571f 100644 (file)
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -1611,7 +1611,7 @@ static int Handle_Key(struct wilc_vif *vif,
                                                      &wid, 1,
                                                      wilc_get_vif_idx(vif));
                }
-               up(&hif_drv->sem_test_key_block);
+               complete(&hif_drv->comp_test_key_block);
                break;
 
        case WPA_RX_GTK:
@@ -1645,7 +1645,7 @@ static int Handle_Key(struct wilc_vif *vif,
                                                      wilc_get_vif_idx(vif));
 
                        kfree(pu8keybuf);
-                       up(&hif_drv->sem_test_key_block);
+                       complete(&hif_drv->comp_test_key_block);
                } else if (pstrHostIFkeyAttr->action & ADDKEY) {
                        pu8keybuf = kzalloc(RX_MIC_KEY_MSG_LEN, GFP_KERNEL);
                        if (pu8keybuf == NULL) {
@@ -1674,7 +1674,7 @@ static int Handle_Key(struct wilc_vif *vif,
                                                      wilc_get_vif_idx(vif));
 
                        kfree(pu8keybuf);
-                       up(&hif_drv->sem_test_key_block);
+                       complete(&hif_drv->comp_test_key_block);
                }
 _WPARxGtk_end_case_:
                kfree(pstrHostIFkeyAttr->attr.wpa.key);
@@ -1712,7 +1712,7 @@ _WPARxGtk_end_case_:
                                                      strWIDList, 2,
                                                      wilc_get_vif_idx(vif));
                        kfree(pu8keybuf);
-                       up(&hif_drv->sem_test_key_block);
+                       complete(&hif_drv->comp_test_key_block);
                } else if (pstrHostIFkeyAttr->action & ADDKEY) {
                        pu8keybuf = kmalloc(PTK_KEY_MSG_LEN, GFP_KERNEL);
                        if (!pu8keybuf) {
@@ -1735,7 +1735,7 @@ _WPARxGtk_end_case_:
                                                      &wid, 1,
                                                      wilc_get_vif_idx(vif));
                        kfree(pu8keybuf);
-                       up(&hif_drv->sem_test_key_block);
+                       complete(&hif_drv->comp_test_key_block);
                }
 
 _WPAPtk_end_case_:
@@ -2731,7 +2731,7 @@ int wilc_remove_wep_key(struct wilc_vif *vif, u8 index)
        result = wilc_mq_send(&hif_msg_q, &msg, sizeof(struct host_if_msg));
        if (result)
                netdev_err(vif->ndev, "Request to remove WEP key\n");
-       down(&hif_drv->sem_test_key_block);
+       wait_for_completion(&hif_drv->comp_test_key_block);
 
        return result;
 }
@@ -2759,7 +2759,7 @@ int wilc_set_wep_default_keyid(struct wilc_vif *vif, u8 index)
        result = wilc_mq_send(&hif_msg_q, &msg, sizeof(struct host_if_msg));
        if (result)
                netdev_err(vif->ndev, "Default key index\n");
-       down(&hif_drv->sem_test_key_block);
+       wait_for_completion(&hif_drv->comp_test_key_block);
 
        return result;
 }
@@ -2792,7 +2792,7 @@ int wilc_add_wep_key_bss_sta(struct wilc_vif *vif, const u8 *key, u8 len,
        result = wilc_mq_send(&hif_msg_q, &msg, sizeof(struct host_if_msg));
        if (result)
                netdev_err(vif->ndev, "STA - WEP Key\n");
-       down(&hif_drv->sem_test_key_block);
+       wait_for_completion(&hif_drv->comp_test_key_block);
 
        return result;
 }
@@ -2828,7 +2828,7 @@ int wilc_add_wep_key_bss_ap(struct wilc_vif *vif, const u8 *key, u8 len,
 
        if (result)
                netdev_err(vif->ndev, "AP - WEP Key\n");
-       down(&hif_drv->sem_test_key_block);
+       wait_for_completion(&hif_drv->comp_test_key_block);
 
        return result;
 }
@@ -2884,7 +2884,7 @@ int wilc_add_ptk(struct wilc_vif *vif, const u8 *ptk, u8 ptk_key_len,
        if (result)
                netdev_err(vif->ndev, "PTK Key\n");
 
-       down(&hif_drv->sem_test_key_block);
+       wait_for_completion(&hif_drv->comp_test_key_block);
 
        return result;
 }
@@ -2952,7 +2952,7 @@ int wilc_add_rx_gtk(struct wilc_vif *vif, const u8 *rx_gtk, u8 gtk_key_len,
        if (result)
                netdev_err(vif->ndev, "RX GTK\n");
 
-       down(&hif_drv->sem_test_key_block);
+       wait_for_completion(&hif_drv->comp_test_key_block);
 
        return result;
 }
@@ -3405,7 +3405,7 @@ int wilc_init(struct net_device *dev, struct host_if_drv **hif_drv_handler)
                sema_init(&hif_sema_deinit, 1);
        }
 
-       sema_init(&hif_drv->sem_test_key_block, 0);
+       init_completion(&hif_drv->comp_test_key_block);
        init_completion(&hif_drv->comp_test_disconn_block);
        init_completion(&hif_drv->comp_get_rssi);
        init_completion(&hif_drv->comp_inactive_time);

diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h
index 3ab94a7..8d2dd0d 100644 (file)
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -275,7 +275,7 @@ struct host_if_drv {
        struct cfg_param_attr cfg_values;
 
        struct mutex cfg_values_lock;
-       struct semaphore sem_test_key_block;
+       struct completion comp_test_key_block;
        struct completion comp_test_disconn_block;
        struct completion comp_get_rssi;
        struct completion comp_inactive_time;