From: Malcolm Priestley Date: Mon, 28 Jul 2014 20:43:27 +0000 (+0100) Subject: staging: vt6655: remove undefined TASK_LET code X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=795d644c0a91089182a3fede73bd88404819e61b;p=deliverable%2Flinux.git staging: vt6655: remove undefined TASK_LET code Removing all code within and function MngWorkItem. Signed-off-by: Malcolm Priestley Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/vt6655/device.h b/drivers/staging/vt6655/device.h index a707984e4516..fccb510fb3f7 100644 --- a/drivers/staging/vt6655/device.h +++ b/drivers/staging/vt6655/device.h @@ -425,7 +425,6 @@ typedef struct __device_info { spinlock_t lock; //PLICE_DEBUG-> - struct tasklet_struct RxMngWorkItem; RxManagementQueue rxManeQueue; //PLICE_DEBUG<- //PLICE_DEBUG -> diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c index 1e1d3b451653..c43fc79eb4c6 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -1704,9 +1704,6 @@ static int device_open(struct net_device *dev) vMgrTimerInit(pDevice); //PLICE_DEBUG-> -#ifdef TASK_LET - tasklet_init(&pDevice->RxMngWorkItem, (void *)MngWorkItem, (unsigned long)pDevice); -#endif #ifdef THREAD InitRxManagementQueue(pDevice); mlme_kill = 0; @@ -1789,9 +1786,6 @@ static int device_close(struct net_device *dev) del_timer(&pDevice->TimerSQ3Tmax3); } -#ifdef TASK_LET - tasklet_kill(&pDevice->RxMngWorkItem); -#endif netif_stop_queue(dev); pDevice->bCmdRunning = false; MACbShutdown(pDevice->PortOffset); diff --git a/drivers/staging/vt6655/dpc.c b/drivers/staging/vt6655/dpc.c index ac588cb8fb22..31bb2b760498 100644 --- a/drivers/staging/vt6655/dpc.c +++ b/drivers/staging/vt6655/dpc.c @@ -268,23 +268,6 @@ s_vGetDASA(unsigned char *pbyRxBufferAddr, unsigned int *pcbHeaderSize, *pcbHeaderSize = cbHeaderSize; } -//PLICE_DEBUG -> - -void MngWorkItem(void *Context) -{ - PSRxMgmtPacket pRxMgmtPacket; - PSDevice pDevice = (PSDevice) Context; - - spin_lock_irq(&pDevice->lock); - while (pDevice->rxManeQueue.packet_num != 0) { - pRxMgmtPacket = DeQueue(pDevice); - vMgrRxManagePacket(pDevice, pDevice->pMgmt, pRxMgmtPacket); - } - spin_unlock_irq(&pDevice->lock); -} - -//PLICE_DEBUG<- - bool device_receive_frame( PSDevice pDevice, @@ -551,15 +534,8 @@ device_receive_frame( #ifdef THREAD EnQueue(pDevice, pRxPacket); #else - -#ifdef TASK_LET - EnQueue(pDevice, pRxPacket); - tasklet_schedule(&pDevice->RxMngWorkItem); -#else vMgrRxManagePacket((void *)pDevice, pDevice->pMgmt, pRxPacket); #endif - -#endif //PLICE_DEBUG<- // hostap Deamon handle 802.11 management if (pDevice->bEnableHostapd) { diff --git a/drivers/staging/vt6655/dpc.h b/drivers/staging/vt6655/dpc.h index 0c7e0e796ce3..4914890115e4 100644 --- a/drivers/staging/vt6655/dpc.h +++ b/drivers/staging/vt6655/dpc.h @@ -39,6 +39,4 @@ device_receive_frame( PSRxDesc pCurrRD ); -void MngWorkItem(void *Context); - #endif // __RXTX_H__