Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b27a6d5e authored by Binoy Jayan's avatar Binoy Jayan Committed by Greg Kroah-Hartman
Browse files

staging: wilc1000: Replace semaphore txq_event with completion 



The semaphore 'txq_event' is used as completion, so convert it
to a struct completion type.

Signed-off-by: default avatarBinoy Jayan <binoy.jayan@linaro.org>
Reviewed-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b9811891

drivers/staging/wilc1000/linux_wlan.c

+4 −4
Original line number Diff line number Diff line
@@ -316,7 +316,7 @@ static int linux_wlan_txq_task(void *vp) 


	complete(&wl->txq_thread_started);

	while (1) {

		down(&wl->txq_event);

		wait_for_completion(&wl->txq_event);



		if (wl->close) {

			complete(&wl->txq_thread_started);
@@ -650,7 +650,7 @@ void wilc1000_wlan_deinit(struct net_device *dev) 
			mutex_unlock(&wl->hif_cs);

		}

		if (&wl->txq_event)

			up(&wl->txq_event);

			wait_for_completion(&wl->txq_event);



		wlan_deinitialize_threads(dev);

		deinit_irq(dev);
@@ -681,7 +681,7 @@ static int wlan_init_locks(struct net_device *dev) 
	spin_lock_init(&wl->txq_spinlock);

	sema_init(&wl->txq_add_to_head_cs, 1);



	sema_init(&wl->txq_event, 0);

	init_completion(&wl->txq_event);



	sema_init(&wl->cfg_event, 0);

	sema_init(&wl->sync_event, 0);
@@ -738,7 +738,7 @@ static void wlan_deinitialize_threads(struct net_device *dev) 
	wl->close = 1;



	if (&wl->txq_event)

		up(&wl->txq_event);

		complete(&wl->txq_event);



	if (wl->txq_thread) {

		kthread_stop(wl->txq_thread);

drivers/staging/wilc1000/wilc_wfi_netdevice.h

+2 −1
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ 
#include "host_interface.h"

#include "wilc_wlan.h"

#include <linux/wireless.h>

#include <linux/completion.h>



#define FLOW_CONTROL_LOWER_THRESHOLD	128

#define FLOW_CONTROL_UPPER_THRESHOLD	256
@@ -178,7 +179,7 @@ struct wilc { 


	struct semaphore cfg_event;

	struct semaphore sync_event;

	struct semaphore txq_event;

	struct completion txq_event;

	struct completion txq_thread_started;



	struct task_struct *txq_thread;

drivers/staging/wilc1000/wilc_wlan.c

+5 −3
Original line number Diff line number Diff line 
#include <linux/completion.h>

#include "wilc_wlan_if.h"

#include "wilc_wlan.h"

#include "wilc_wfi_netdevice.h"
@@ -89,7 +90,7 @@ static void wilc_wlan_txq_add_to_tail(struct net_device *dev, 


	spin_unlock_irqrestore(&wilc->txq_spinlock, flags);



	up(&wilc->txq_event);

	complete(&wilc->txq_event);

}



static int wilc_wlan_txq_add_to_head(struct wilc_vif *vif,
@@ -119,7 +120,7 @@ static int wilc_wlan_txq_add_to_head(struct wilc_vif *vif, 


	spin_unlock_irqrestore(&wilc->txq_spinlock, flags);

	up(&wilc->txq_add_to_head_cs);

	up(&wilc->txq_event);

	complete(&wilc->txq_event);



	return 0;

}
@@ -287,7 +288,8 @@ static int wilc_wlan_txq_filter_dup_tcp_ack(struct net_device *dev) 
	spin_unlock_irqrestore(&wilc->txq_spinlock, wilc->txq_spinlock_flags);



	while (dropped > 0) {

		wilc_lock_timeout(wilc, &wilc->txq_event, 1);

		wait_for_completion_timeout(&wilc->txq_event,

						msecs_to_jiffies(1));

		dropped--;

	}