Commit 85718c2d authored by Glen Lee's avatar Glen Lee Committed by Greg Kroah-Hartman
Browse files

staging: wilc1000: remove unused semaphore and it's related codes 



Variable rxq_event, rxq_wait_event and rxq_wait have the same pointer.

nwi->os_context.rxq_wait_event = (void *)&g_linux_wlan->rxq_event;
g_wlan.rxq_wait = inp->os_context.rxq_wait_event;

They are never aquired(down) since down function was only called in
linux_wlan_rxq_task which was deleted in a previous patch.
So delete variable rxq_event, rxq_wait_event, rxq_wait and it's related codes.

Signed-off-by: default avatarGlen Lee <glen.lee@atmel.com>
Signed-off-by: default avatarTony Cho <tony.cho@atmel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 51f8a399

drivers/staging/wilc1000/linux_wlan.c

+0 −9
Original line number Diff line number Diff line
@@ -1088,10 +1088,6 @@ void wilc1000_wlan_deinit(linux_wlan_t *nic) 
		  #endif

		#endif



		/* not sure if the following unlocks are needed or not*/

		if (&g_linux_wlan->rxq_event != NULL)

			up(&g_linux_wlan->rxq_event);



		if (&g_linux_wlan->txq_event != NULL)

			up(&g_linux_wlan->txq_event);
@@ -1156,7 +1152,6 @@ int wlan_init_locks(linux_wlan_t *p_nic) 
	sema_init(&g_linux_wlan->txq_add_to_head_cs, 1);



	sema_init(&g_linux_wlan->txq_event, 0);

	sema_init(&g_linux_wlan->rxq_event, 0);



	sema_init(&g_linux_wlan->cfg_event, 0);

	sema_init(&g_linux_wlan->sync_event, 0);
@@ -1207,7 +1202,6 @@ void linux_to_wlan(wilc_wlan_inp_t *nwi, linux_wlan_t *nic) 
	nwi->os_context.rx_buffer_size = LINUX_RX_SIZE;

#endif

	nwi->os_context.rxq_critical_section = (void *)&g_linux_wlan->rxq_cs;

	nwi->os_context.rxq_wait_event = (void *)&g_linux_wlan->rxq_event;

	nwi->os_context.cfg_wait_event = (void *)&g_linux_wlan->cfg_event;



	nwi->os_func.os_debug = linux_wlan_dbg;
@@ -1282,7 +1276,6 @@ int wlan_initialize_threads(perInterface_wlan_t *nic) 
_fail_2:

	/*De-Initialize 2nd thread*/

	g_linux_wlan->close = 1;

	up(&g_linux_wlan->rxq_event);

	kthread_stop(g_linux_wlan->rxq_thread);



	#if (RX_BH_TYPE == RX_BH_KTHREAD)
@@ -1301,8 +1294,6 @@ static void wlan_deinitialize_threads(linux_wlan_t *nic) 


	g_linux_wlan->close = 1;

	PRINT_D(INIT_DBG, "Deinitializing Threads\n");

	if (&g_linux_wlan->rxq_event != NULL)

		up(&g_linux_wlan->rxq_event);



	if (g_linux_wlan->rxq_thread != NULL) {

		kthread_stop(g_linux_wlan->rxq_thread);

drivers/staging/wilc1000/wilc_wfi_netdevice.h

+0 −1
Original line number Diff line number Diff line
@@ -187,7 +187,6 @@ typedef struct { 
	struct mutex rxq_cs;

	struct mutex hif_cs;



	struct semaphore rxq_event;

	struct semaphore cfg_event;

	struct semaphore sync_event;

	struct semaphore txq_event;

drivers/staging/wilc1000/wilc_wlan.c

+0 −3
Original line number Diff line number Diff line
@@ -90,7 +90,6 @@ typedef struct { 
	struct rxq_entry_t *rxq_head;

	struct rxq_entry_t *rxq_tail;

	int rxq_entries;

	void *rxq_wait;

	int rxq_exit;
@@ -1398,7 +1397,6 @@ _end_: 
				rqe->buffer_size = size;

				PRINT_D(RX_DBG, "rxq entery Size= %d - Address = %p\n", rqe->buffer_size, rqe->buffer);

				wilc_wlan_rxq_add(rqe);

				up(p->rxq_wait);

			}

		} else {

#ifndef MEMORY_STATIC
@@ -2049,7 +2047,6 @@ int wilc_wlan_init(wilc_wlan_inp_t *inp, wilc_wlan_oup_t *oup) 


	g_wlan.rxq_lock = inp->os_context.rxq_critical_section;

	g_wlan.txq_wait = inp->os_context.txq_wait_event;

	g_wlan.rxq_wait = inp->os_context.rxq_wait_event;

	g_wlan.cfg_wait = inp->os_context.cfg_wait_event;

	g_wlan.tx_buffer_size = inp->os_context.tx_buffer_size;

#if defined (MEMORY_STATIC)

drivers/staging/wilc1000/wilc_wlan_if.h

+0 −1
Original line number Diff line number Diff line
@@ -137,7 +137,6 @@ typedef struct { 
	u32 rx_buffer_size;

#endif

	void *rxq_critical_section;

	void *rxq_wait_event;



	struct semaphore *cfg_wait_event;

} wilc_wlan_os_context_t;

CRA Git | Maintained and supported by SUSTech CRA and CCSE