Commit 1cac57a2 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/enumeration' 

- Rename pcibios_add_device() to pcibios_device_add() since it's called
  from pci_device_add() (Oliver O'Halloran)

- Don't try to enable AtomicOps on VFs, since they can only be enabled on
  the PF (Selvin Xavier)

* pci/enumeration:
  PCI: Do not enable AtomicOps on VFs
  PCI: Rename pcibios_add_device() to pcibios_device_add()
parents 5e19196c 5ec0a6fc

arch/microblaze/pci/pci-common.c

+1 −2
Original line number Diff line number Diff line
@@ -587,13 +587,12 @@ static void pcibios_fixup_resources(struct pci_dev *dev) 
}

DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, pcibios_fixup_resources);



int pcibios_add_device(struct pci_dev *dev)

int pcibios_device_add(struct pci_dev *dev)

{

	dev->irq = of_irq_parse_and_map_pci(dev, 0, 0);



	return 0;

}

EXPORT_SYMBOL(pcibios_add_device);



/*

 * Reparent resource children of pr that conflict with res

arch/powerpc/kernel/pci-common.c

+1 −1
Original line number Diff line number Diff line
@@ -1059,7 +1059,7 @@ void pcibios_bus_add_device(struct pci_dev *dev) 
		ppc_md.pcibios_bus_add_device(dev);

}



int pcibios_add_device(struct pci_dev *dev)

int pcibios_device_add(struct pci_dev *dev)

{

	struct irq_domain *d;

arch/powerpc/platforms/powernv/pci-sriov.c

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ 
 * to "new_size", calculated above. Implementing this is a convoluted process

 * which requires several hooks in the PCI core:

 *

 * 1. In pcibios_add_device() we call pnv_pci_ioda_fixup_iov().

 * 1. In pcibios_device_add() we call pnv_pci_ioda_fixup_iov().

 *

 *    At this point the device has been probed and the device's BARs are sized,

 *    but no resource allocations have been done. The SR-IOV BARs are sized

arch/s390/pci/pci.c

+1 −1
Original line number Diff line number Diff line
@@ -561,7 +561,7 @@ static void zpci_cleanup_bus_resources(struct zpci_dev *zdev) 
	zdev->has_resources = 0;

}



int pcibios_add_device(struct pci_dev *pdev)

int pcibios_device_add(struct pci_dev *pdev)

{

	struct zpci_dev *zdev = to_zpci(pdev);

	struct resource *res;

arch/sparc/kernel/pci.c

+1 −1
Original line number Diff line number Diff line
@@ -1010,7 +1010,7 @@ void pcibios_set_master(struct pci_dev *dev) 
}



#ifdef CONFIG_PCI_IOV

int pcibios_add_device(struct pci_dev *dev)

int pcibios_device_add(struct pci_dev *dev)

{

	struct pci_dev *pdev;