redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

drivers/net: remove unnecessary flush_scheduled_work() calls

Browse source 
janz-ican3, sh_eth, skge and vxge don't use workqueue at all and there
is no reason to flush the system_wq.  Drop flush_scheduled_work()
calls and references to workqueue.

Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Wolfgang Grandegger <wg@grandegger.com>
Cc: Stephen Hemminger <shemminger@linux-foundation.org>
Cc: Ramkrishna Vepa <ramkrishna.vepa@exar.com>
Cc: Sivakumar Subramani <sivakumar.subramani@exar.com>
Cc: Sreenivasa Honnur <sreenivasa.honnur@exar.com>
Cc: Jon Mason <jon.mason@exar.com>
Cc: netdev@vger.kernel.org
This commit is contained in:
Tejun Heo 2010-12-12 16:45:14 +01:00
parent ad1184c6cf
commit 6e07ebd84e
5 changed files with 0 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/net/can/janz-ican3.c
View file

@ -1114,11 +1114,6 @@ static bool ican3_txok(struct ican3_dev *mod)
/*
* Recieve one CAN frame from the hardware
*
* This works like the core of a NAPI function, but is intended to be called
* from workqueue context instead. This driver already needs a workqueue to
* process control messages, so we use the workqueue instead of using NAPI.
* This was done to simplify locking.
*
* CONTEXT: must be called from user context
*/
static int ican3_recv_skb(struct ican3_dev *mod)
@ -1251,7 +1246,6 @@ static irqreturn_t ican3_irq(int irq, void *dev_id)
* Reset an ICAN module to its power-on state
*
* CONTEXT: no network device registered
* LOCKING: work function disabled
*/
static int ican3_reset_module(struct ican3_dev *mod)
{
@ -1262,9 +1256,6 @@ static int ican3_reset_module(struct ican3_dev *mod)
/* disable interrupts so no more work is scheduled */
iowrite8(1 << mod->num, &mod->ctrl->int_disable);
/* flush any pending work */
flush_scheduled_work();
/* the first unallocated page in the DPM is #9 */
mod->free_page = DPM_FREE_START;

1
drivers/net/sh_eth.c
View file

@ -1552,7 +1552,6 @@ static int sh_eth_drv_remove(struct platform_device *pdev)
sh_mdio_release(ndev);
unregister_netdev(ndev);
flush_scheduled_work();
pm_runtime_disable(&pdev->dev);
free_netdev(ndev);
platform_set_drvdata(pdev, NULL);

1
drivers/net/sh_eth.h
View file

@ -26,7 +26,6 @@
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/spinlock.h>
#include <linux/workqueue.h>
#include <linux/netdevice.h>
#include <linux/phy.h>

2
drivers/net/skge.c
View file

@ -4012,8 +4012,6 @@ static void __devexit skge_remove(struct pci_dev *pdev)
if (!hw)
return;
flush_scheduled_work();
dev1 = hw->dev[1];
if (dev1)
unregister_netdev(dev1);

2
drivers/net/vxge/vxge-main.c
View file

@ -3439,8 +3439,6 @@ static void vxge_device_unregister(struct __vxge_hw_device *hldev)
strncpy(buf, dev->name, IFNAMSIZ);
flush_scheduled_work();
/* in 2.6 will call stop() if device is up */
unregister_netdev(dev);