浏览代码

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>
Gavin Shan 11 年之前
父节点
当前提交
21dd5a43d0
共有 1 个文件被更改,包括 1 次插入10 次删除
  1. 1 10
      arch/powerpc/kernel/pci-common.c

+ 1 - 10
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)
 void pcibios_reset_secondary_bus(struct pci_dev *dev)
 {
 {
-	u16 ctrl;
-
 	if (ppc_md.pcibios_reset_secondary_bus) {
 	if (ppc_md.pcibios_reset_secondary_bus) {
 		ppc_md.pcibios_reset_secondary_bus(dev);
 		ppc_md.pcibios_reset_secondary_bus(dev);
 		return;
 		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)
 static resource_size_t pcibios_io_size(const struct pci_controller *hose)