aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/pmcraid.c
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2011-01-24 08:57:28 -0500
committerJames Bottomley <James.Bottomley@suse.de>2011-02-12 11:31:02 -0500
commita684b8da35a429a246ec2a91e2742bdff5209709 (patch)
tree656a47c18b4c8d8f138175702a33846a5d3194e2 /drivers/scsi/pmcraid.c
parent75c65a5edaa8b815c1428314eaf696788f1ebbdb (diff)
[SCSI] remove flush_scheduled_work() usages
Simple conversions to drop flush_scheduled_work() usages in drivers/scsi. More involved ones will be done in separate patches. * NCR5380, megaraid_sas: cancel_delayed_work() + flush_scheduled_work() -> cancel_delayed_work_sync(). * mpt2sas_scsih: drop unnecessary flush_scheduled_work(). * arcmsr_hba, ipr, pmcraid: flush the used work explicitly instead of using flush_scheduled_work(). Signed-off-by: Tejun Heo <tj@kernel.org> Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/scsi/pmcraid.c')
-rw-r--r--drivers/scsi/pmcraid.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c
index 321cf3ae8630..bcf858e88c64 100644
--- a/drivers/scsi/pmcraid.c
+++ b/drivers/scsi/pmcraid.c
@@ -5454,7 +5454,7 @@ static void __devexit pmcraid_remove(struct pci_dev *pdev)
5454 pmcraid_shutdown(pdev); 5454 pmcraid_shutdown(pdev);
5455 5455
5456 pmcraid_disable_interrupts(pinstance, ~0); 5456 pmcraid_disable_interrupts(pinstance, ~0);
5457 flush_scheduled_work(); 5457 flush_work_sync(&pinstance->worker_q);
5458 5458
5459 pmcraid_kill_tasklets(pinstance); 5459 pmcraid_kill_tasklets(pinstance);
5460 pmcraid_unregister_interrupt_handler(pinstance); 5460 pmcraid_unregister_interrupt_handler(pinstance);