Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a684b8da authored by Tejun Heo's avatar Tejun Heo Committed by James Bottomley
Browse files

[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: default avatarTejun Heo <tj@kernel.org>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent 75c65a5e

drivers/scsi/NCR5380.c

+1 −2
Original line number Diff line number Diff line
@@ -936,8 +936,7 @@ static void NCR5380_exit(struct Scsi_Host *instance) 
{

	struct NCR5380_hostdata *hostdata = (struct NCR5380_hostdata *) instance->hostdata;



	cancel_delayed_work(&hostdata->coroutine);

	flush_scheduled_work();

	cancel_delayed_work_sync(&hostdata->coroutine);

}



/**

drivers/scsi/arcmsr/arcmsr_hba.c

+2 −2
Original line number Diff line number Diff line
@@ -1022,7 +1022,7 @@ static void arcmsr_remove(struct pci_dev *pdev) 
	int poll_count = 0;

	arcmsr_free_sysfs_attr(acb);

	scsi_remove_host(host);

	flush_scheduled_work();

	flush_work_sync(&acb->arcmsr_do_message_isr_bh);

	del_timer_sync(&acb->eternal_timer);

	arcmsr_disable_outbound_ints(acb);

	arcmsr_stop_adapter_bgrb(acb);
@@ -1068,7 +1068,7 @@ static void arcmsr_shutdown(struct pci_dev *pdev) 
		(struct AdapterControlBlock *)host->hostdata;

	del_timer_sync(&acb->eternal_timer);

	arcmsr_disable_outbound_ints(acb);

	flush_scheduled_work();

	flush_work_sync(&acb->arcmsr_do_message_isr_bh);

	arcmsr_stop_adapter_bgrb(acb);

	arcmsr_flush_adapter_cache(acb);

}

drivers/scsi/ipr.c

+1 −1
Original line number Diff line number Diff line
@@ -8865,7 +8865,7 @@ static void __ipr_remove(struct pci_dev *pdev) 


	spin_unlock_irqrestore(ioa_cfg->host->host_lock, host_lock_flags);

	wait_event(ioa_cfg->reset_wait_q, !ioa_cfg->in_reset_reload);

	flush_scheduled_work();

	flush_work_sync(&ioa_cfg->work_q);

	spin_lock_irqsave(ioa_cfg->host->host_lock, host_lock_flags);



	spin_lock(&ipr_driver_lock);

drivers/scsi/megaraid/megaraid_sas_base.c

+2 −4
Original line number Diff line number Diff line
@@ -4242,9 +4242,8 @@ megasas_suspend(struct pci_dev *pdev, pm_message_t state) 
	/* cancel the delayed work if this work still in queue */

	if (instance->ev != NULL) {

		struct megasas_aen_event *ev = instance->ev;

		cancel_delayed_work(

		cancel_delayed_work_sync(

			(struct delayed_work *)&ev->hotplug_work);

		flush_scheduled_work();

		instance->ev = NULL;

	}
@@ -4417,9 +4416,8 @@ static void __devexit megasas_detach_one(struct pci_dev *pdev) 
	/* cancel the delayed work if this work still in queue*/

	if (instance->ev != NULL) {

		struct megasas_aen_event *ev = instance->ev;

		cancel_delayed_work(

		cancel_delayed_work_sync(

			(struct delayed_work *)&ev->hotplug_work);

		flush_scheduled_work();

		instance->ev = NULL;

	}

drivers/scsi/mpt2sas/mpt2sas_scsih.c

+0 −1
Original line number Diff line number Diff line
@@ -6935,7 +6935,6 @@ _scsih_suspend(struct pci_dev *pdev, pm_message_t state) 
	u32 device_state;



	mpt2sas_base_stop_watchdog(ioc);

	flush_scheduled_work();

	scsi_block_requests(shost);

	device_state = pci_choose_state(pdev, state);

	printk(MPT2SAS_INFO_FMT "pdev=0x%p, slot=%s, entering "