aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/ipr.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/ipr.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/ipr.c')
-rw-r--r--drivers/scsi/ipr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
index 9c5c8be72231..a8e24f06b8d8 100644
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
@@ -8865,7 +8865,7 @@ static void __ipr_remove(struct pci_dev *pdev)
8865 8865
8866 spin_unlock_irqrestore(ioa_cfg->host->host_lock, host_lock_flags); 8866 spin_unlock_irqrestore(ioa_cfg->host->host_lock, host_lock_flags);
8867 wait_event(ioa_cfg->reset_wait_q, !ioa_cfg->in_reset_reload); 8867 wait_event(ioa_cfg->reset_wait_q, !ioa_cfg->in_reset_reload);
8868 flush_scheduled_work(); 8868 flush_work_sync(&ioa_cfg->work_q);
8869 spin_lock_irqsave(ioa_cfg->host->host_lock, host_lock_flags); 8869 spin_lock_irqsave(ioa_cfg->host->host_lock, host_lock_flags);
8870 8870
8871 spin_lock(&ipr_driver_lock); 8871 spin_lock(&ipr_driver_lock);