Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 404437ef authored by Tejun Heo's avatar Tejun Heo
Browse files

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: default avatarTejun Heo <tj@kernel.org>
Acked-by: default avatarJiri Kosina <jkosina@suse.cz>
Acked-by: default avatarDavid Sterba <dsterba@suse.cz>
parent 9b00a818

drivers/char/pcmcia/ipwireless/hardware.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

drivers/char/pcmcia/ipwireless/network.c

+2 −1
Original line number Diff line number Diff line
@@ -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);

drivers/char/pcmcia/ipwireless/tty.c

+1 −1
Original line number Diff line number Diff line
@@ -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);