diff options
| author | Tejun Heo <tj@kernel.org> | 2010-12-12 16:45:14 +0100 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2010-12-12 16:45:14 +0100 |
| commit | f5c35cc191afd08d660e6db0fecc9f431dc8f273 (patch) | |
| tree | 74a6544921bec9a4c994846d3149729c1968a2be /drivers/net/ehea/ehea_main.c | |
| parent | 3d6b892bcc4c810071e36d8aff25aa171f55f93d (diff) | |
| download | blackbird-op-linux-f5c35cc191afd08d660e6db0fecc9f431dc8f273.tar.gz blackbird-op-linux-f5c35cc191afd08d660e6db0fecc9f431dc8f273.zip | |
ehea: don't use flush_scheduled_work()
Directly cancel port->reset_task from ehea_shutdown_single_port()
instead. As this cancels the work for each port on driver detach,
flushing system_wq from ehea_remove() or ehea_module_exit() is no
longer necessary.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Breno Leitao <leitao@linux.vnet.ibm.com>
Cc: netdev@vger.kernel.org
Diffstat (limited to 'drivers/net/ehea/ehea_main.c')
| -rw-r--r-- | drivers/net/ehea/ehea_main.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/ehea/ehea_main.c b/drivers/net/ehea/ehea_main.c index d51def112d35..81e5b7b49e9e 100644 --- a/drivers/net/ehea/ehea_main.c +++ b/drivers/net/ehea/ehea_main.c @@ -3318,6 +3318,8 @@ out_err: static void ehea_shutdown_single_port(struct ehea_port *port) { struct ehea_adapter *adapter = port->adapter; + + cancel_work_sync(&port->reset_task); unregister_netdev(port->netdev); ehea_unregister_port(port); kfree(port->mc_list); @@ -3607,8 +3609,6 @@ static int __devexit ehea_remove(struct platform_device *dev) ehea_remove_device_sysfs(dev); - flush_scheduled_work(); - ibmebus_free_irq(adapter->neq->attr.ist1, adapter); tasklet_kill(&adapter->neq_tasklet); @@ -3797,7 +3797,6 @@ static void __exit ehea_module_exit(void) { int ret; - flush_scheduled_work(); driver_remove_file(&ehea_driver.driver, &driver_attr_capabilities); ibmebus_unregister_driver(&ehea_driver); unregister_reboot_notifier(&ehea_reboot_nb); |
