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

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: Tejun Heo <tj@kernel.org>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>

authored by

Tejun Heo and committed by
Dominik Brodowski
97299c72 0f64f70e

-7
-3
drivers/pcmcia/au1000_generic.c
··· 441 441 442 442 443 443 out_err: 444 - flush_scheduled_work(); 445 444 ops->hw_shutdown(skt); 446 445 while (i-- > 0) { 447 446 skt = PCMCIA_SOCKET(i); 448 447 449 448 del_timer_sync(&skt->poll_timer); 450 449 pcmcia_unregister_socket(&skt->socket); 451 - flush_scheduled_work(); 452 450 if (i == 0) { 453 451 iounmap(skt->virt_io + (u32)mips_io_port_base); 454 452 skt->virt_io = NULL; ··· 478 480 479 481 del_timer_sync(&skt->poll_timer); 480 482 pcmcia_unregister_socket(&skt->socket); 481 - flush_scheduled_work(); 482 483 skt->ops->hw_shutdown(skt); 483 484 au1x00_pcmcia_config_skt(skt, &dead_socket); 484 485 iounmap(skt->virt_io + (u32)mips_io_port_base);
-4
drivers/pcmcia/soc_common.c
··· 627 627 628 628 pcmcia_unregister_socket(&skt->socket); 629 629 630 - flush_scheduled_work(); 631 - 632 630 skt->ops->hw_shutdown(skt); 633 631 634 632 soc_common_pcmcia_config_skt(skt, &dead_socket); ··· 718 720 pcmcia_unregister_socket(&skt->socket); 719 721 720 722 out_err_7: 721 - flush_scheduled_work(); 722 - 723 723 skt->ops->hw_shutdown(skt); 724 724 out_err_6: 725 725 list_del(&skt->node);