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

Commit cc64c817 authored by Robert Elliott's avatar Robert Elliott Committed by James Bottomley
Browse files

hpsa: break hpsa_free_irqs_and_disable_msix into two functions 



replace calls to hpsa_free_irqs_and_disable_msix with
hpsa_free_irqs and hpsa_disable_interrupt_mode

Reviewed-by: default avatarScott Teel <scott.teel@pmcs.com>
Reviewed-by: default avatarKevin Barnett <kevin.barnett@pmcs.com>
Reviewed-by: default avatarTomas Henzl <thenzl@redhat.com>
Reviewed-by: default avatarHannes Reinecke <hare@Suse.de>
Signed-off-by: default avatarRobert Elliott <elliott@hp.com>
Signed-off-by: default avatarDon Brace <don.brace@pmcs.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJames Bottomley <JBottomley@Odin.com>
parent ecf418d1

drivers/scsi/hpsa.c

+18 −17
Original line number Diff line number Diff line
@@ -6351,10 +6351,20 @@ static int find_PCI_BAR_index(struct pci_dev *pdev, unsigned long pci_bar_addr) 
	return -1;

}



static void hpsa_disable_interrupt_mode(struct ctlr_info *h)

{

	if (h->msix_vector) {

		if (h->pdev->msix_enabled)

			pci_disable_msix(h->pdev);

	} else if (h->msi_vector) {

		if (h->pdev->msi_enabled)

			pci_disable_msi(h->pdev);

	}

}



/* If MSI/MSI-X is supported by the kernel we will try to enable it on

 * controllers that are capable. If not, we use legacy INTx mode.

 */



static void hpsa_interrupt_mode(struct ctlr_info *h)

{

#ifdef CONFIG_PCI_MSI
@@ -6995,20 +7005,6 @@ static int hpsa_kdump_soft_reset(struct ctlr_info *h) 
	return 0;

}



static void hpsa_free_irqs_and_disable_msix(struct ctlr_info *h)

{

	hpsa_free_irqs(h);

#ifdef CONFIG_PCI_MSI

	if (h->msix_vector) {

		if (h->pdev->msix_enabled)

			pci_disable_msix(h->pdev);

	} else if (h->msi_vector) {

		if (h->pdev->msi_enabled)

			pci_disable_msi(h->pdev);

	}

#endif /* CONFIG_PCI_MSI */

}



static void hpsa_free_reply_queues(struct ctlr_info *h)

{

	int i;
@@ -7025,7 +7021,7 @@ static void hpsa_free_reply_queues(struct ctlr_info *h) 


static void hpsa_undo_allocations_after_kdump_soft_reset(struct ctlr_info *h)

{

	hpsa_free_irqs_and_disable_msix(h);

	hpsa_free_irqs(h);

	hpsa_free_sg_chain_blocks(h);

	hpsa_free_cmd_pool(h);

	kfree(h->ioaccel1_blockFetchTable);
@@ -7037,6 +7033,7 @@ static void hpsa_undo_allocations_after_kdump_soft_reset(struct ctlr_info *h) 
		iounmap(h->transtable);

	if (h->cfgtable)

		iounmap(h->cfgtable);

	hpsa_disable_interrupt_mode(h);

	pci_disable_device(h->pdev);

	pci_release_regions(h->pdev);

	kfree(h);
@@ -7531,7 +7528,8 @@ static void hpsa_shutdown(struct pci_dev *pdev) 
	 */

	hpsa_flush_cache(h);

	h->access.set_intr_mask(h, HPSA_INTR_OFF);

	hpsa_free_irqs_and_disable_msix(h);

	hpsa_free_irqs(h);

	hpsa_disable_interrupt_mode(h);		/* pci_init 2 */

}



static void hpsa_free_device_info(struct ctlr_info *h)
@@ -7562,7 +7560,10 @@ static void hpsa_remove_one(struct pci_dev *pdev) 
	destroy_workqueue(h->rescan_ctlr_wq);

	destroy_workqueue(h->resubmit_wq);

	hpsa_unregister_scsi(h);	/* unhook from SCSI subsystem */



	/* includes hpsa_free_irqs and hpsa_disable_interrupt_mode */

	hpsa_shutdown(pdev);



	iounmap(h->vaddr);

	iounmap(h->transtable);

	iounmap(h->cfgtable);