aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/lpfc
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2007-12-19 23:28:09 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2008-02-01 18:04:27 -0500
commit0948391641918b95d8d96c15089eb5ac156850b3 (patch)
tree8120c8b1eb2307ae13bddb62de1f4682c6c1cbc3 /drivers/scsi/lpfc
parentb718989da7cf1f77ed5665dba0d2c73bd9dfe2d7 (diff)
PCI: Remove users of pci_enable_device_bars()
This patch converts users of pci_enable_device_bars() to the new pci_enable_device_{io,mem} interface. The new API fits nicely, except maybe for the QLA case where a bit of code re-organization might be a good idea but I prefer sticking to the simple patch as I don't have hardware to test on. I'll also need some feedback on the cs5520 change. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/scsi/lpfc')
-rw-r--r--drivers/scsi/lpfc/lpfc_init.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
index 3205f7488d1c..29b4cf9e059b 100644
--- a/drivers/scsi/lpfc/lpfc_init.c
+++ b/drivers/scsi/lpfc/lpfc_init.c
@@ -2296,10 +2296,9 @@ static pci_ers_result_t lpfc_io_slot_reset(struct pci_dev *pdev)
2296 struct Scsi_Host *shost = pci_get_drvdata(pdev); 2296 struct Scsi_Host *shost = pci_get_drvdata(pdev);
2297 struct lpfc_hba *phba = ((struct lpfc_vport *)shost->hostdata)->phba; 2297 struct lpfc_hba *phba = ((struct lpfc_vport *)shost->hostdata)->phba;
2298 struct lpfc_sli *psli = &phba->sli; 2298 struct lpfc_sli *psli = &phba->sli;
2299 int bars = pci_select_bars(pdev, IORESOURCE_MEM);
2300 2299
2301 dev_printk(KERN_INFO, &pdev->dev, "recovering from a slot reset.\n"); 2300 dev_printk(KERN_INFO, &pdev->dev, "recovering from a slot reset.\n");
2302 if (pci_enable_device_bars(pdev, bars)) { 2301 if (pci_enable_device_mem(pdev)) {
2303 printk(KERN_ERR "lpfc: Cannot re-enable " 2302 printk(KERN_ERR "lpfc: Cannot re-enable "
2304 "PCI device after reset.\n"); 2303 "PCI device after reset.\n");
2305 return PCI_ERS_RESULT_DISCONNECT; 2304 return PCI_ERS_RESULT_DISCONNECT;