diff options
author | Tejun Heo <tj@kernel.org> | 2010-10-15 10:58:21 -0400 |
---|---|---|
committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2010-10-16 05:07:37 -0400 |
commit | 97299c726881603f44c30be8718c24015e7a4676 (patch) | |
tree | 1b8fae199393764bdef4b65c64badb79410510c7 /drivers/pcmcia/soc_common.c | |
parent | 0f64f70e9c029450e38fcc496148ffc9256bf8c1 (diff) |
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>
Diffstat (limited to 'drivers/pcmcia/soc_common.c')
-rw-r--r-- | drivers/pcmcia/soc_common.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/pcmcia/soc_common.c b/drivers/pcmcia/soc_common.c index 6f1a86b43c60..689e3c02edb8 100644 --- a/drivers/pcmcia/soc_common.c +++ b/drivers/pcmcia/soc_common.c | |||
@@ -627,8 +627,6 @@ void soc_pcmcia_remove_one(struct soc_pcmcia_socket *skt) | |||
627 | 627 | ||
628 | pcmcia_unregister_socket(&skt->socket); | 628 | pcmcia_unregister_socket(&skt->socket); |
629 | 629 | ||
630 | flush_scheduled_work(); | ||
631 | |||
632 | skt->ops->hw_shutdown(skt); | 630 | skt->ops->hw_shutdown(skt); |
633 | 631 | ||
634 | soc_common_pcmcia_config_skt(skt, &dead_socket); | 632 | soc_common_pcmcia_config_skt(skt, &dead_socket); |
@@ -720,8 +718,6 @@ int soc_pcmcia_add_one(struct soc_pcmcia_socket *skt) | |||
720 | pcmcia_unregister_socket(&skt->socket); | 718 | pcmcia_unregister_socket(&skt->socket); |
721 | 719 | ||
722 | out_err_7: | 720 | out_err_7: |
723 | flush_scheduled_work(); | ||
724 | |||
725 | skt->ops->hw_shutdown(skt); | 721 | skt->ops->hw_shutdown(skt); |
726 | out_err_6: | 722 | out_err_6: |
727 | list_del(&skt->node); | 723 | list_del(&skt->node); |