Skip to content

Commit

Permalink
pcmcia: don't call flush_scheduled_work() spuriously
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
htejun authored and Dominik Brodowski committed Oct 16, 2010
1 parent 0f64f70 commit 97299c7
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 7 deletions.
3 changes: 0 additions & 3 deletions drivers/pcmcia/au1000_generic.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down
4 changes: 0 additions & 4 deletions drivers/pcmcia/soc_common.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 97299c7

Please sign in to comment.