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

diff --git a/drivers/net/ehea/ehea_main.c b/drivers/net/ehea/ehea_main.c
index d51def112d3544bd227faa0921f7a6dc4119a3c6..81e5b7b49e9ee23072d006cc22d33c8244d2249b 100644 (file)
--- 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);