staging: wilc1000: host_interface: remove unused semaphores

Remove unused semaphore declarations, initializations, and unlocks.

The functions that locked these semaphores were previously removed,
so this cleans up the remains.

Signed-off-by: Alison Schofield <amsfield22@gmail.com>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
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 04337c7f8e8bd4bb5f4a4975c3923315cd62add9..f4ca365135110a828107c4e164c197959628c973 100644 (file)
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -1973,7 +1973,6 @@ static s32 Handle_GetChnl(struct wilc_vif *vif)
 {
        s32 result = 0;
        struct wid wid;
-       struct host_if_drv *hif_drv = vif->hif_drv;
 
        wid.id = (u16)WID_CURRENT_CHANNEL;
        wid.type = WID_CHAR;
@@ -1988,8 +1987,6 @@ static s32 Handle_GetChnl(struct wilc_vif *vif)
                result = -EFAULT;
        }
 
-       up(&hif_drv->sem_get_chnl);
-
        return result;
 }
 
@@ -2017,7 +2014,6 @@ static void Handle_GetLinkspeed(struct wilc_vif *vif)
 {
        s32 result = 0;
        struct wid wid;
-       struct host_if_drv *hif_drv = vif->hif_drv;
 
        link_speed = 0;
 
@@ -2033,7 +2029,6 @@ static void Handle_GetLinkspeed(struct wilc_vif *vif)
                result = -EFAULT;
        }
 
-       up(&hif_drv->sem_get_link_speed);
 }
 
 static s32 Handle_GetStatistics(struct wilc_vif *vif,
@@ -3630,8 +3625,6 @@ int wilc_init(struct net_device *dev, struct host_if_drv **hif_drv_handler)
        sema_init(&hif_drv->sem_test_key_block, 0);
        sema_init(&hif_drv->sem_test_disconn_block, 0);
        sema_init(&hif_drv->sem_get_rssi, 0);
-       sema_init(&hif_drv->sem_get_link_speed, 0);
-       sema_init(&hif_drv->sem_get_chnl, 0);
        sema_init(&hif_drv->sem_inactive_time, 0);
 
        if (clients_count == 0) {

diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h
index 5e65f2cfb8cbad9a002e17a14896f3a4224963cf..6135024b039aea9f017301017f666f21109b4d11 100644 (file)
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -278,8 +278,6 @@ struct host_if_drv {
        struct semaphore sem_test_key_block;
        struct semaphore sem_test_disconn_block;
        struct semaphore sem_get_rssi;
-       struct semaphore sem_get_link_speed;
-       struct semaphore sem_get_chnl;
        struct semaphore sem_inactive_time;
 
        struct timer_list scan_timer;