leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: vt6656: covert RXvMngWorkItem to work queue

Browse Source 
Tasklet to workqueue.
RxMngWorkItem -> rx_mng_work_item

Reduce atomic area of driver and dependency on system timer.

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Malcolm Priestley 2013-09-27 16:55:45 +01:00 committed by Greg Kroah-Hartman
parent 81d720d315
commit a21fc2f5be
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/vt6656/device.h
View File

@ -385,7 +385,7 @@ struct vnt_private {
struct tasklet_struct CmdWorkItem; struct tasklet_struct CmdWorkItem;
struct tasklet_struct EventWorkItem; struct tasklet_struct EventWorkItem;
struct work_struct read_work_item; struct work_struct read_work_item;
struct tasklet_struct RxMngWorkItem; struct work_struct rx_mng_work_item;
u32 rx_buf_sz; u32 rx_buf_sz;
int multicast_limit; int multicast_limit;

6
drivers/staging/vt6656/dpc.c
View File

@ -559,7 +559,7 @@ int RXbBulkInProcessData(struct vnt_private *pDevice, struct vnt_rcb *pRCB,
} }
if (pDevice->bIsRxMngWorkItemQueued == false) { if (pDevice->bIsRxMngWorkItemQueued == false) {
pDevice->bIsRxMngWorkItemQueued = true; pDevice->bIsRxMngWorkItemQueued = true;
tasklet_schedule(&pDevice->RxMngWorkItem); schedule_work(&pDevice->rx_mng_work_item);
} }
} }
@ -1390,8 +1390,10 @@ void RXvFreeRCB(struct vnt_rcb *pRCB, int bReAllocSkb)
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"<----RXFreeRCB %d %d\n",pDevice->NumRecvFreeList, pDevice->NumRecvMngList); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"<----RXFreeRCB %d %d\n",pDevice->NumRecvFreeList, pDevice->NumRecvMngList);
} }
void RXvMngWorkItem(struct vnt_private *pDevice) void RXvMngWorkItem(struct work_struct *work)
{ {
struct vnt_private *pDevice =
container_of(work, struct vnt_private, rx_mng_work_item);
struct vnt_rcb *pRCB = NULL; struct vnt_rcb *pRCB = NULL;
struct vnt_rx_mgmt *pRxPacket; struct vnt_rx_mgmt *pRxPacket;
int bReAllocSkb = false; int bReAllocSkb = false;

2
drivers/staging/vt6656/dpc.h
View File

@ -34,7 +34,7 @@
void RXvWorkItem(struct work_struct *work); void RXvWorkItem(struct work_struct *work);
void RXvMngWorkItem(void *Context); void RXvMngWorkItem(struct work_struct *work);
void RXvFreeRCB(struct vnt_rcb *pRCB, int bReAllocSkb); void RXvFreeRCB(struct vnt_rcb *pRCB, int bReAllocSkb);

5
drivers/staging/vt6656/main_usb.c
View File

@ -705,6 +705,7 @@ vt6656_probe(struct usb_interface *intf, const struct usb_device_id *id)
INIT_DELAYED_WORK(&pDevice->run_command_work, vRunCommand); INIT_DELAYED_WORK(&pDevice->run_command_work, vRunCommand);
INIT_DELAYED_WORK(&pDevice->second_callback_work, BSSvSecondCallBack); INIT_DELAYED_WORK(&pDevice->second_callback_work, BSSvSecondCallBack);
INIT_WORK(&pDevice->read_work_item, RXvWorkItem); INIT_WORK(&pDevice->read_work_item, RXvWorkItem);
INIT_WORK(&pDevice->rx_mng_work_item, RXvMngWorkItem);
pDevice->tx_80211 = device_dma0_tx_80211; pDevice->tx_80211 = device_dma0_tx_80211;
pDevice->vnt_mgmt.pAdapter = (void *) pDevice; pDevice->vnt_mgmt.pAdapter = (void *) pDevice;
@ -984,7 +985,7 @@ static int device_open(struct net_device *dev)
} }
vMgrObjectInit(pDevice); vMgrObjectInit(pDevice);
tasklet_init(&pDevice->RxMngWorkItem, (void *)RXvMngWorkItem, (unsigned long)pDevice);
tasklet_init(&pDevice->EventWorkItem, (void *)INTvWorkItem, (unsigned long)pDevice); tasklet_init(&pDevice->EventWorkItem, (void *)INTvWorkItem, (unsigned long)pDevice);
schedule_delayed_work(&pDevice->second_callback_work, HZ); schedule_delayed_work(&pDevice->second_callback_work, HZ);
@ -1091,8 +1092,8 @@ static int device_close(struct net_device *dev)
del_timer(&pDevice->TimerSQ3Tmax2); del_timer(&pDevice->TimerSQ3Tmax2);
del_timer(&pDevice->TimerSQ3Tmax3); del_timer(&pDevice->TimerSQ3Tmax3);
} }
tasklet_kill(&pDevice->RxMngWorkItem);
cancel_work_sync(&pDevice->rx_mng_work_item);
cancel_work_sync(&pDevice->read_work_item); cancel_work_sync(&pDevice->read_work_item);
tasklet_kill(&pDevice->EventWorkItem); tasklet_kill(&pDevice->EventWorkItem);