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

Commit 97299c72 authored by Tejun Heo's avatar Tejun Heo Committed by Dominik Brodowski
Browse files

pcmcia: don't call flush_scheduled_work() spuriously 



au100_generic and soc_common call flush_scheduled_work() spuriously.
Remove them.

This is to prepare for the deprecation and removal of
flush_scheduled_work().

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
parent 0f64f70e

drivers/pcmcia/au1000_generic.c

+0 −3
Original line number Diff line number Diff line
@@ -441,14 +441,12 @@ int au1x00_pcmcia_socket_probe(struct device *dev, struct pcmcia_low_level *ops, 




out_err:

	flush_scheduled_work();

	ops->hw_shutdown(skt);

	while (i-- > 0) {

		skt = PCMCIA_SOCKET(i);



		del_timer_sync(&skt->poll_timer);

		pcmcia_unregister_socket(&skt->socket);

		flush_scheduled_work();

		if (i == 0) {

			iounmap(skt->virt_io + (u32)mips_io_port_base);

			skt->virt_io = NULL;
@@ -480,7 +478,6 @@ int au1x00_drv_pcmcia_remove(struct platform_device *dev) 


		del_timer_sync(&skt->poll_timer);

		pcmcia_unregister_socket(&skt->socket);

		flush_scheduled_work();

		skt->ops->hw_shutdown(skt);

		au1x00_pcmcia_config_skt(skt, &dead_socket);

		iounmap(skt->virt_io + (u32)mips_io_port_base);

drivers/pcmcia/soc_common.c

+0 −4
Original line number Diff line number Diff line
@@ -627,8 +627,6 @@ void soc_pcmcia_remove_one(struct soc_pcmcia_socket *skt) 


	pcmcia_unregister_socket(&skt->socket);



	flush_scheduled_work();



	skt->ops->hw_shutdown(skt);



	soc_common_pcmcia_config_skt(skt, &dead_socket);
@@ -720,8 +718,6 @@ int soc_pcmcia_add_one(struct soc_pcmcia_socket *skt) 
	pcmcia_unregister_socket(&skt->socket);



 out_err_7:

	flush_scheduled_work();



	skt->ops->hw_shutdown(skt);

 out_err_6:

	list_del(&skt->node);