Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

Tejun Heo 404437ef 9b00a818

+4 -3
+1 -1
drivers/char/pcmcia/ipwireless/hardware.c
··· 1729 1729 1730 1730 ipwireless_stop_interrupts(hw); 1731 1731 1732 - flush_scheduled_work(); 1732 + flush_work_sync(&hw->work_rx); 1733 1733 1734 1734 for (i = 0; i < NL_NUM_OF_ADDRESSES; i++) 1735 1735 if (hw->packet_assembler[i] != NULL)
+2 -1
drivers/char/pcmcia/ipwireless/network.c
··· 430 430 network->shutting_down = 1; 431 431 432 432 ipwireless_ppp_close(network); 433 - flush_scheduled_work(); 433 + flush_work_sync(&network->work_go_online); 434 + flush_work_sync(&network->work_go_offline); 434 435 435 436 ipwireless_stop_interrupts(network->hardware); 436 437 ipwireless_associate_network(network->hardware, NULL);
+1 -1
drivers/char/pcmcia/ipwireless/tty.c
··· 577 577 mutex_unlock(&ttyj->ipw_tty_mutex); 578 578 tty_hangup(ttyj->linux_tty); 579 579 /* Wait till the tty_hangup has completed */ 580 - flush_scheduled_work(); 580 + flush_work_sync(&ttyj->linux_tty->hangup_work); 581 581 /* FIXME: Exactly how is the tty object locked here 582 582 against a parallel ioctl etc */ 583 583 mutex_lock(&ttyj->ipw_tty_mutex);