pcmcia/ipwireless: don't use flush_scheduled_work()

flush_scheduled_work() is deprecated and scheduled to be removed.
Directly flush the used works instead.

Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Jiri Kosina <jkosina@suse.cz>
Acked-by: David Sterba <dsterba@suse.cz>

diff --git a/drivers/char/pcmcia/ipwireless/hardware.c b/drivers/char/pcmcia/ipwireless/hardware.c
index 99cffdab1056565c3e73276a3cf304a8224c5d8e..0aeb5a38d2963bcc6bc4e010b3c2376a788aa55b 100644 (file)
--- a/drivers/char/pcmcia/ipwireless/hardware.c
+++ b/drivers/char/pcmcia/ipwireless/hardware.c
@@ -1729,7 +1729,7 @@ void ipwireless_hardware_free(struct ipw_hardware *hw)
 
        ipwireless_stop_interrupts(hw);
 
-       flush_scheduled_work();
+       flush_work_sync(&hw->work_rx);
 
        for (i = 0; i < NL_NUM_OF_ADDRESSES; i++)
                if (hw->packet_assembler[i] != NULL)

diff --git a/drivers/char/pcmcia/ipwireless/network.c b/drivers/char/pcmcia/ipwireless/network.c
index 9fe538347932939a7caadce5fec586bee8103312..f7daeea598e43e12e02b0cceafd066c1690ad3d4 100644 (file)
--- a/drivers/char/pcmcia/ipwireless/network.c
+++ b/drivers/char/pcmcia/ipwireless/network.c
@@ -430,7 +430,8 @@ void ipwireless_network_free(struct ipw_network *network)
        network->shutting_down = 1;
 
        ipwireless_ppp_close(network);
-       flush_scheduled_work();
+       flush_work_sync(&network->work_go_online);
+       flush_work_sync(&network->work_go_offline);
 
        ipwireless_stop_interrupts(network->hardware);
        ipwireless_associate_network(network->hardware, NULL);

diff --git a/drivers/char/pcmcia/ipwireless/tty.c b/drivers/char/pcmcia/ipwireless/tty.c
index 1a2c2c3b068f08401ead84b00d1e6a63c6ff0728..f5eb28b6cb0f53da42c256d1f92f3832d9405af7 100644 (file)
--- a/drivers/char/pcmcia/ipwireless/tty.c
+++ b/drivers/char/pcmcia/ipwireless/tty.c
@@ -577,7 +577,7 @@ void ipwireless_tty_free(struct ipw_tty *tty)
                                mutex_unlock(&ttyj->ipw_tty_mutex);
                                tty_hangup(ttyj->linux_tty);
                                /* Wait till the tty_hangup has completed */
-                               flush_scheduled_work();
+                               flush_work_sync(&ttyj->linux_tty->hangup_work);
                                /* FIXME: Exactly how is the tty object locked here
                                   against a parallel ioctl etc */
                                mutex_lock(&ttyj->ipw_tty_mutex);