2016-10-20 08:54:48

by Binoy Jayan

Subject: [PATCH] staging: wilc1000: Remove unused function wilc_lock_timeout

Semaphore are going away in the future, so remove the unused function
wilc_lock_timeout which calls a semaphore api but has no users.

Signed-off-by: Binoy Jayan <[email protected]>
---

They following is a patch which removes semaphores from wilc1000.
Its part of a bigger effort to eliminate all semaphores
from the linux kernel.

drivers/staging/wilc1000/linux_wlan.c | 11 -----------
1 file changed, 11 deletions(-)

diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c
index 6370a5e..470d59f 100644
--- a/drivers/staging/wilc1000/linux_wlan.c
+++ b/drivers/staging/wilc1000/linux_wlan.c
@@ -218,17 +218,6 @@ static void deinit_irq(struct net_device *dev)
}
}

-int wilc_lock_timeout(struct wilc *nic, void *vp, u32 timeout)
-{
- /* FIXME: replace with mutex_lock or wait_for_completion */
- int error = -1;
-
- if (vp)
- error = down_timeout(vp,
- msecs_to_jiffies(timeout));
- return error;
-}
-
void wilc_mac_indicate(struct wilc *wilc, int flag)
{
int status;
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project

2016-10-20 09:18:12

by Arnd Bergmann

Subject: Re: [PATCH] staging: wilc1000: Remove unused function wilc_lock_timeout

On Thursday, October 20, 2016 2:24:32 PM CEST Binoy Jayan wrote:
> Semaphore are going away in the future, so remove the unused function
> wilc_lock_timeout which calls a semaphore api but has no users.
>
> Signed-off-by: Binoy Jayan <[email protected]>
> ---
>
> They following is a patch which removes semaphores from wilc1000.
> Its part of a bigger effort to eliminate all semaphores
> from the linux kernel.

Good catch!

> drivers/staging/wilc1000/linux_wlan.c | 11 -----------
> 1 file changed, 11 deletions(-)
>
> diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c
> index 6370a5e..470d59f 100644
> --- a/drivers/staging/wilc1000/linux_wlan.c
> +++ b/drivers/staging/wilc1000/linux_wlan.c
> @@ -218,17 +218,6 @@ static void deinit_irq(struct net_device *dev)
> }
> }
>
> -int wilc_lock_timeout(struct wilc *nic, void *vp, u32 timeout)
> -{
> - /* FIXME: replace with mutex_lock or wait_for_completion */
> - int error = -1;
> -
> - if (vp)
> - error = down_timeout(vp,
> - msecs_to_jiffies(timeout));
> - return error;
> -}

You need to remove the prototype from wilc_wfi_netdevice.h
as well. Once you do that, please add

Reviewed-by: Arnd Bergmann <[email protected]>