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

Commit e0c0483c authored by Johannes Thumshirn's avatar Johannes Thumshirn Committed by Bjorn Helgaas
Browse files

lpfc: Use pci_(request|release)_mem_regions 



Now that we do have pci_request_mem_regions() and pci_release_mem_regions()
at hand, use it in the lpfc driver.

Suggested-by: default avatarChristoph Hellwig <hch@infradead.org>
Signed-off-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Acked-by: default avatarDick Kennedy <dick.kennedy@broadcom.com>
CC: James Smart <james.smart@avagotech.com>
CC: James E.J. Bottomley <jejb@linux.vnet.ibm.com>
CC: Martin K. Petersen <martin.petersen@oracle.com>
parent a1f447b3

drivers/scsi/lpfc/lpfc_init.c

+4 −11
Original line number Diff line number Diff line
@@ -4775,20 +4775,17 @@ static int 
lpfc_enable_pci_dev(struct lpfc_hba *phba)

{

	struct pci_dev *pdev;

	int bars = 0;



	/* Obtain PCI device reference */

	if (!phba->pcidev)

		goto out_error;

	else

		pdev = phba->pcidev;

	/* Select PCI BARs */

	bars = pci_select_bars(pdev, IORESOURCE_MEM);

	/* Enable PCI device */

	if (pci_enable_device_mem(pdev))

		goto out_error;

	/* Request PCI resource for the device */

	if (pci_request_selected_regions(pdev, bars, LPFC_DRIVER_NAME))

	if (pci_request_mem_regions(pdev, LPFC_DRIVER_NAME))

		goto out_disable_device;

	/* Set up device as PCI master and save state for EEH */

	pci_set_master(pdev);
@@ -4805,7 +4802,7 @@ lpfc_enable_pci_dev(struct lpfc_hba *phba) 
	pci_disable_device(pdev);

out_error:

	lpfc_printf_log(phba, KERN_ERR, LOG_INIT,

			"1401 Failed to enable pci device, bars:x%x\n", bars);

			"1401 Failed to enable pci device\n");

	return -ENODEV;

}
@@ -4820,17 +4817,14 @@ static void 
lpfc_disable_pci_dev(struct lpfc_hba *phba)

{

	struct pci_dev *pdev;

	int bars;



	/* Obtain PCI device reference */

	if (!phba->pcidev)

		return;

	else

		pdev = phba->pcidev;

	/* Select PCI BARs */

	bars = pci_select_bars(pdev, IORESOURCE_MEM);

	/* Release PCI resource and disable PCI device */

	pci_release_selected_regions(pdev, bars);

	pci_release_mem_regions(pdev);

	pci_disable_device(pdev);



	return;
@@ -9722,7 +9716,6 @@ lpfc_pci_remove_one_s3(struct pci_dev *pdev) 
	struct lpfc_vport **vports;

	struct lpfc_hba   *phba = vport->phba;

	int i;

	int bars = pci_select_bars(pdev, IORESOURCE_MEM);



	spin_lock_irq(&phba->hbalock);

	vport->load_flag |= FC_UNLOADING;
@@ -9797,7 +9790,7 @@ lpfc_pci_remove_one_s3(struct pci_dev *pdev) 


	lpfc_hba_free(phba);



	pci_release_selected_regions(pdev, bars);

	pci_release_mem_regions(pdev);

	pci_disable_device(pdev);

}