From 23411f37ca886053cd212f9056af97a3b5c9054e Mon Sep 17 00:00:00 2001 From: Alison Schofield Date: Tue, 16 Feb 2016 00:30:35 -0800 Subject: [PATCH] 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 Reviewed-by: Arnd Bergmann Signed-off-by: Greg Kroah-Hartman --- drivers/staging/wilc1000/host_interface.c | 7 ------- drivers/staging/wilc1000/host_interface.h | 2 -- 2 files changed, 9 deletions(-) diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c index 04337c7..f4ca365 100644 --- 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 5e65f2cf..6135024 100644 --- 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; -- 2.7.4