leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pcmcia: don't call flush_scheduled_work() spuriously

Browse Source 
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>
This commit is contained in:
Tejun Heo 2010-10-15 16:58:21 +02:00 committed by Dominik Brodowski
parent 0f64f70e9c
commit 97299c7268
2 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/pcmcia/au1000_generic.c
View File

@ -441,14 +441,12 @@ int au1x00_pcmcia_socket_probe(struct device *dev, struct pcmcia_low_level *ops,
out_err: out_err:
flush_scheduled_work();
ops->hw_shutdown(skt); ops->hw_shutdown(skt);
while (i-- > 0) { while (i-- > 0) {
skt = PCMCIA_SOCKET(i); skt = PCMCIA_SOCKET(i);
del_timer_sync(&skt->poll_timer); del_timer_sync(&skt->poll_timer);
pcmcia_unregister_socket(&skt->socket); pcmcia_unregister_socket(&skt->socket);
flush_scheduled_work();
if (i == 0) { if (i == 0) {
iounmap(skt->virt_io + (u32)mips_io_port_base); iounmap(skt->virt_io + (u32)mips_io_port_base);
skt->virt_io = NULL; skt->virt_io = NULL;
@ -480,7 +478,6 @@ int au1x00_drv_pcmcia_remove(struct platform_device *dev)
del_timer_sync(&skt->poll_timer); del_timer_sync(&skt->poll_timer);
pcmcia_unregister_socket(&skt->socket); pcmcia_unregister_socket(&skt->socket);
flush_scheduled_work();
skt->ops->hw_shutdown(skt); skt->ops->hw_shutdown(skt);
au1x00_pcmcia_config_skt(skt, &dead_socket); au1x00_pcmcia_config_skt(skt, &dead_socket);
iounmap(skt->virt_io + (u32)mips_io_port_base); iounmap(skt->virt_io + (u32)mips_io_port_base);

4
drivers/pcmcia/soc_common.c
View File

@ -627,8 +627,6 @@ void soc_pcmcia_remove_one(struct soc_pcmcia_socket *skt)
pcmcia_unregister_socket(&skt->socket); pcmcia_unregister_socket(&skt->socket);
flush_scheduled_work();
skt->ops->hw_shutdown(skt); skt->ops->hw_shutdown(skt);
soc_common_pcmcia_config_skt(skt, &dead_socket); 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); pcmcia_unregister_socket(&skt->socket);
out_err_7: out_err_7:
flush_scheduled_work();
skt->ops->hw_shutdown(skt); skt->ops->hw_shutdown(skt);
out_err_6: out_err_6:
list_del(&skt->node); list_del(&skt->node);