diff options
| author | Gavin Shan <gwshan@linux.vnet.ibm.com> | 2014-06-19 17:22:45 +1000 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-07-03 16:45:04 -0600 |
| commit | 21dd5a43d00ca513c6a4a31fa86bbe608f68ed49 (patch) | |
| tree | 9b392214633e8541344a8fbd9ced4408af8ebe78 /arch | |
| parent | 9e33002fd1791bcab626b19301670484c1cb6d50 (diff) | |
| download | op-kernel-dev-21dd5a43d00ca513c6a4a31fa86bbe608f68ed49.zip op-kernel-dev-21dd5a43d00ca513c6a4a31fa86bbe608f68ed49.tar.gz | |
powerpc/pci: Remove duplicate logic
Since the logic to reset PCI secondary bus by PCI config register
PCI_BRIDGE_CTL_BUS_RESET is included in pci_reset_secondary_bus(), we
needn't implement another one.
Remove the duplicate implementation and call pci_reset_secondary_bus().
Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/kernel/pci-common.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c index b49c72f..b2814e2 100644 --- a/arch/powerpc/kernel/pci-common.c +++ b/arch/powerpc/kernel/pci-common.c @@ -123,21 +123,12 @@ resource_size_t pcibios_window_alignment(struct pci_bus *bus, void pcibios_reset_secondary_bus(struct pci_dev *dev) { - u16 ctrl; - if (ppc_md.pcibios_reset_secondary_bus) { ppc_md.pcibios_reset_secondary_bus(dev); return; } - pci_read_config_word(dev, PCI_BRIDGE_CONTROL, &ctrl); - ctrl |= PCI_BRIDGE_CTL_BUS_RESET; - pci_write_config_word(dev, PCI_BRIDGE_CONTROL, ctrl); - msleep(2); - - ctrl &= ~PCI_BRIDGE_CTL_BUS_RESET; - pci_write_config_word(dev, PCI_BRIDGE_CONTROL, ctrl); - ssleep(1); + pci_reset_secondary_bus(dev); } static resource_size_t pcibios_io_size(const struct pci_controller *hose) |
