Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-15 09:34:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lpfc: Use pci_(request|release)_mem_regions

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

Suggested-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Dick 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>
This commit is contained in:
Johannes Thumshirn 2016-06-07 09:44:03 +02:00 committed by Bjorn Helgaas
parent a1f447b35b
commit e0c0483c22
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/scsi/lpfc/lpfc_init.c
View File

@ -4775,20 +4775,17 @@ static int
lpfc_enable_pci_dev(struct lpfc_hba *phba) lpfc_enable_pci_dev(struct lpfc_hba *phba)
{ {
struct pci_dev *pdev; struct pci_dev *pdev;
int bars = 0;
/* Obtain PCI device reference */ /* Obtain PCI device reference */
if (!phba->pcidev) if (!phba->pcidev)
goto out_error; goto out_error;
else else
pdev = phba->pcidev; pdev = phba->pcidev;
/* Select PCI BARs */
bars = pci_select_bars(pdev, IORESOURCE_MEM);
/* Enable PCI device */ /* Enable PCI device */
if (pci_enable_device_mem(pdev)) if (pci_enable_device_mem(pdev))
goto out_error; goto out_error;
/* Request PCI resource for the device */ /* 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; goto out_disable_device;
/* Set up device as PCI master and save state for EEH */ /* Set up device as PCI master and save state for EEH */
pci_set_master(pdev); pci_set_master(pdev);
@ -4805,7 +4802,7 @@ out_disable_device:
pci_disable_device(pdev); pci_disable_device(pdev);
out_error: out_error:
lpfc_printf_log(phba, KERN_ERR, LOG_INIT, 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; return -ENODEV;
} }
@ -4820,17 +4817,14 @@ static void
lpfc_disable_pci_dev(struct lpfc_hba *phba) lpfc_disable_pci_dev(struct lpfc_hba *phba)
{ {
struct pci_dev *pdev; struct pci_dev *pdev;
int bars;
/* Obtain PCI device reference */ /* Obtain PCI device reference */
if (!phba->pcidev) if (!phba->pcidev)
return; return;
else else
pdev = phba->pcidev; pdev = phba->pcidev;
/* Select PCI BARs */
bars = pci_select_bars(pdev, IORESOURCE_MEM);
/* Release PCI resource and disable PCI device */ /* Release PCI resource and disable PCI device */
pci_release_selected_regions(pdev, bars); pci_release_mem_regions(pdev);
pci_disable_device(pdev); pci_disable_device(pdev);
return; return;
@ -9722,7 +9716,6 @@ lpfc_pci_remove_one_s3(struct pci_dev *pdev)
struct lpfc_vport **vports; struct lpfc_vport **vports;
struct lpfc_hba *phba = vport->phba; struct lpfc_hba *phba = vport->phba;
int i; int i;
int bars = pci_select_bars(pdev, IORESOURCE_MEM);
spin_lock_irq(&phba->hbalock); spin_lock_irq(&phba->hbalock);
vport->load_flag |= FC_UNLOADING; vport->load_flag |= FC_UNLOADING;
@ -9797,7 +9790,7 @@ lpfc_pci_remove_one_s3(struct pci_dev *pdev)
lpfc_hba_free(phba); lpfc_hba_free(phba);
pci_release_selected_regions(pdev, bars); pci_release_mem_regions(pdev);
pci_disable_device(pdev); pci_disable_device(pdev);
} }