diff options
| author | Joshua Houghton <josh@awful.name> | 2016-08-01 19:17:25 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-08-21 17:27:16 +0200 |
| commit | eeeb5fb9323c75663da5a8d1d068cd7176aa77b4 (patch) | |
| tree | 28dbdd0a65840c1019a6bfde3c424be1bd932371 /drivers/staging/wilc1000 | |
| parent | aec8755d9d7a72a2fb74dfcb95d709710d5be44a (diff) | |
drivers: wilc1000: remove references to semaphores
* Update the comments that refer to semaphores
* Remove redundant includes to semphore.h
Signed-off-by: Joshua Houghton <josh@awful.name>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/wilc1000')
| -rw-r--r-- | drivers/staging/wilc1000/TODO | 1 | ||||
| -rw-r--r-- | drivers/staging/wilc1000/linux_wlan.c | 1 | ||||
| -rw-r--r-- | drivers/staging/wilc1000/wilc_wfi_netdevice.h | 2 | ||||
| -rw-r--r-- | drivers/staging/wilc1000/wilc_wlan.h | 2 | ||||
| -rw-r--r-- | drivers/staging/wilc1000/wilc_wlan_if.h | 1 |
5 files changed, 2 insertions, 5 deletions
diff --git a/drivers/staging/wilc1000/TODO b/drivers/staging/wilc1000/TODO index ec93b2ee0b08..ae61b55f14fd 100644 --- a/drivers/staging/wilc1000/TODO +++ b/drivers/staging/wilc1000/TODO @@ -3,7 +3,6 @@ TODO: - remove OS wrapper functions - remove custom debug and tracing functions - rework comments and function headers(also coding style) -- replace all semaphores with mutexes or completions - Move handling for each individual members of 'union message_body' out into a separate 'struct work_struct' and completely remove the multiplexer that is currently part of host_if_work(), allowing movement of the diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c index 3a66255f14fc..315ed2ea2925 100644 --- a/drivers/staging/wilc1000/linux_wlan.c +++ b/drivers/staging/wilc1000/linux_wlan.c @@ -21,7 +21,6 @@ #include <linux/kernel.h> #include <linux/skbuff.h> #include <linux/mutex.h> -#include <linux/semaphore.h> #include <linux/completion.h> static int dev_state_ev_handler(struct notifier_block *this, diff --git a/drivers/staging/wilc1000/wilc_wfi_netdevice.h b/drivers/staging/wilc1000/wilc_wfi_netdevice.h index 5cc6a82d8081..ec6b1674cf38 100644 --- a/drivers/staging/wilc1000/wilc_wfi_netdevice.h +++ b/drivers/staging/wilc1000/wilc_wfi_netdevice.h @@ -131,7 +131,7 @@ struct wilc_priv { struct wilc_wfi_key *wilc_gtk[MAX_NUM_STA]; struct wilc_wfi_key *wilc_ptk[MAX_NUM_STA]; u8 wilc_groupkey; - /* semaphores */ + /* mutexes */ struct mutex scan_req_lock; /* */ bool gbAutoRateAdjusted; diff --git a/drivers/staging/wilc1000/wilc_wlan.h b/drivers/staging/wilc1000/wilc_wlan.h index 30e5312ee87e..de6c4ddbf45a 100644 --- a/drivers/staging/wilc1000/wilc_wlan.h +++ b/drivers/staging/wilc1000/wilc_wlan.h @@ -192,7 +192,7 @@ #define ENABLE_RX_VMM (SEL_VMM_TBL1 | EN_VMM) #define ENABLE_TX_VMM (SEL_VMM_TBL0 | EN_VMM) -/*time for expiring the semaphores of cfg packets*/ +/*time for expiring the completion of cfg packets*/ #define CFG_PKTS_TIMEOUT 2000 /******************************************** * diff --git a/drivers/staging/wilc1000/wilc_wlan_if.h b/drivers/staging/wilc1000/wilc_wlan_if.h index 410bfc034319..439ac6f8d533 100644 --- a/drivers/staging/wilc1000/wilc_wlan_if.h +++ b/drivers/staging/wilc1000/wilc_wlan_if.h @@ -10,7 +10,6 @@ #ifndef WILC_WLAN_IF_H #define WILC_WLAN_IF_H -#include <linux/semaphore.h> #include <linux/netdevice.h> /******************************************** |