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

Commit 09483916 authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt Committed by Greg Kroah-Hartman
Browse files

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: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent b718989d

drivers/ata/pata_cs5520.c

+1 −1
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ static int __devinit cs5520_init_one(struct pci_dev *pdev, const struct pci_devi 
		return -ENOMEM;



	/* Perform set up for DMA */

	if (pci_enable_device_bars(pdev, 1<<2)) {

	if (pci_enable_device_io(pdev)) {

		printk(KERN_ERR DRV_NAME ": unable to configure BAR2.\n");

		return -ENODEV;

	}

drivers/i2c/busses/scx200_acb.c

+1 −1
Original line number Diff line number Diff line
@@ -492,7 +492,7 @@ static __init int scx200_create_pci(const char *text, struct pci_dev *pdev, 
	iface->pdev = pdev;

	iface->bar = bar;



	rc = pci_enable_device_bars(iface->pdev, 1 << iface->bar);

	rc = pci_enable_device_io(iface->pdev);

	if (rc)

		goto errout_free;

drivers/ide/pci/cs5520.c

+8 −2
Original line number Diff line number Diff line
@@ -156,8 +156,14 @@ static int __devinit cs5520_init_one(struct pci_dev *dev, const struct pci_devic 
	ide_setup_pci_noise(dev, d);



	/* We must not grab the entire device, it has 'ISA' space in its

	   BARS too and we will freak out other bits of the kernel */

	if (pci_enable_device_bars(dev, 1<<2)) {

	 * BARS too and we will freak out other bits of the kernel

	 *

	 * pci_enable_device_bars() is going away. I replaced it with

	 * IO only enable for now but I'll need confirmation this is

	 * allright for that device. If not, it will need some kind of

	 * quirk. --BenH.

	 */

	if (pci_enable_device_io(dev)) {

		printk(KERN_WARNING "%s: Unable to enable 55x0.\n", d->name);

		return -ENODEV;

	}

drivers/ide/setup-pci.c

+4 −2
Original line number Diff line number Diff line
@@ -240,7 +240,9 @@ EXPORT_SYMBOL_GPL(ide_setup_pci_noise); 
 *	@d: IDE port info

 *

 *	Enable the IDE PCI device. We attempt to enable the device in full

 *	but if that fails then we only need BAR4 so we will enable that.

 *	but if that fails then we only need IO space. The PCI code should

 *	have setup the proper resources for us already for controllers in

 *	legacy mode.

 *	

 *	Returns zero on success or an error code

 */
@@ -250,7 +252,7 @@ static int ide_pci_enable(struct pci_dev *dev, const struct ide_port_info *d) 
	int ret;



	if (pci_enable_device(dev)) {

		ret = pci_enable_device_bars(dev, 1 << 4);

		ret = pci_enable_device_io(dev);

		if (ret < 0) {

			printk(KERN_WARNING "%s: (ide_setup_pci_device:) "

				"Could not enable device.\n", d->name);

drivers/scsi/lpfc/lpfc_init.c

+1 −2
Original line number Diff line number Diff line
@@ -2296,10 +2296,9 @@ static pci_ers_result_t lpfc_io_slot_reset(struct pci_dev *pdev) 
	struct Scsi_Host *shost = pci_get_drvdata(pdev);

	struct lpfc_hba *phba = ((struct lpfc_vport *)shost->hostdata)->phba;

	struct lpfc_sli *psli = &phba->sli;

	int bars = pci_select_bars(pdev, IORESOURCE_MEM);



	dev_printk(KERN_INFO, &pdev->dev, "recovering from a slot reset.\n");

	if (pci_enable_device_bars(pdev, bars)) {

	if (pci_enable_device_mem(pdev)) {

		printk(KERN_ERR "lpfc: Cannot re-enable "

			"PCI device after reset.\n");

		return PCI_ERS_RESULT_DISCONNECT;