diff options
| author | Chunhe Lan <Chunhe.Lan@freescale.com> | 2014-02-11 08:13:10 (GMT) |
|---|---|---|
| committer | Jose Rivera <German.Rivera@freescale.com> | 2014-02-13 15:18:33 (GMT) |
| commit | ef1ca6a33f411d415599288c6d01fa3e7e14bec1 (patch) | |
| tree | 627e723dbea09f266405e1099e2dfb0bf816798b /arch/powerpc/kernel | |
| parent | 2f6b5bbfa7a24cd712d0b097e3faa2116a9bb75a (diff) | |
| download | linux-fsl-qoriq-ef1ca6a33f411d415599288c6d01fa3e7e14bec1.tar.xz | |
powerpc/pci: Remove the calling pcibios_setup_devices() in pcibios_enable_device()
For devices which are hot-plugged, when they are re-scanned,
the pcibios_setup_device is called from pcibios_add_device
if bus setup is complete. So remove the calling pcibios_setup
_devices() from pcibios_enable_device().
With this change, device setup code is called exactly once
for both static and hot plugged devices.
Signed-off-by: Chunhe Lan <Chunhe.Lan@freescale.com>
Change-Id: I5b29412daabbb8ebebc0d198fa3bf30889a7e58c
Reviewed-on: http://git.am.freescale.net:8181/8706
Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com>
Reviewed-by: Scott Wood <scottwood@freescale.com>
Reviewed-by: Jose Rivera <German.Rivera@freescale.com>
Diffstat (limited to 'arch/powerpc/kernel')
| -rw-r--r-- | arch/powerpc/kernel/pci-common.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c index 8c4cbf5..a1e3e40 100644 --- a/arch/powerpc/kernel/pci-common.c +++ b/arch/powerpc/kernel/pci-common.c @@ -1480,10 +1480,6 @@ int pcibios_enable_device(struct pci_dev *dev, int mask) if (ppc_md.pcibios_enable_device_hook(dev)) return -EINVAL; - /* avoid pcie irq fixup impact on cardbus */ - if (dev->hdr_type != PCI_HEADER_TYPE_CARDBUS) - pcibios_setup_device(dev); - return pci_enable_resources(dev, mask); } |