diff options
author | Tejun Heo <tj@kernel.org> | 2010-12-12 10:45:14 -0500 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2010-12-12 10:45:14 -0500 |
commit | 6e07ebd84eef00be9e169a6d15a0bc20b06578fa (patch) | |
tree | 71eaaea0df69b18701e440bb1109d0d361989218 /drivers/net/can/janz-ican3.c | |
parent | ad1184c6cf067a13e8cb2a4e7ccc407f947027d0 (diff) |
drivers/net: remove unnecessary flush_scheduled_work() calls
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
Diffstat (limited to 'drivers/net/can/janz-ican3.c')
-rw-r--r-- | drivers/net/can/janz-ican3.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/net/can/janz-ican3.c b/drivers/net/can/janz-ican3.c index 6e533dcc36c0..b9a6d7a5a739 100644 --- a/drivers/net/can/janz-ican3.c +++ b/drivers/net/can/janz-ican3.c | |||
@@ -1114,11 +1114,6 @@ static bool ican3_txok(struct ican3_dev *mod) | |||
1114 | /* | 1114 | /* |
1115 | * Recieve one CAN frame from the hardware | 1115 | * Recieve one CAN frame from the hardware |
1116 | * | 1116 | * |
1117 | * This works like the core of a NAPI function, but is intended to be called | ||
1118 | * from workqueue context instead. This driver already needs a workqueue to | ||
1119 | * process control messages, so we use the workqueue instead of using NAPI. | ||
1120 | * This was done to simplify locking. | ||
1121 | * | ||
1122 | * CONTEXT: must be called from user context | 1117 | * CONTEXT: must be called from user context |
1123 | */ | 1118 | */ |
1124 | static int ican3_recv_skb(struct ican3_dev *mod) | 1119 | static int ican3_recv_skb(struct ican3_dev *mod) |
@@ -1251,7 +1246,6 @@ static irqreturn_t ican3_irq(int irq, void *dev_id) | |||
1251 | * Reset an ICAN module to its power-on state | 1246 | * Reset an ICAN module to its power-on state |
1252 | * | 1247 | * |
1253 | * CONTEXT: no network device registered | 1248 | * CONTEXT: no network device registered |
1254 | * LOCKING: work function disabled | ||
1255 | */ | 1249 | */ |
1256 | static int ican3_reset_module(struct ican3_dev *mod) | 1250 | static int ican3_reset_module(struct ican3_dev *mod) |
1257 | { | 1251 | { |
@@ -1262,9 +1256,6 @@ static int ican3_reset_module(struct ican3_dev *mod) | |||
1262 | /* disable interrupts so no more work is scheduled */ | 1256 | /* disable interrupts so no more work is scheduled */ |
1263 | iowrite8(1 << mod->num, &mod->ctrl->int_disable); | 1257 | iowrite8(1 << mod->num, &mod->ctrl->int_disable); |
1264 | 1258 | ||
1265 | /* flush any pending work */ | ||
1266 | flush_scheduled_work(); | ||
1267 | |||
1268 | /* the first unallocated page in the DPM is #9 */ | 1259 | /* the first unallocated page in the DPM is #9 */ |
1269 | mod->free_page = DPM_FREE_START; | 1260 | mod->free_page = DPM_FREE_START; |
1270 | 1261 | ||