浏览代码

PCI: ibmhp: use generic pci_hp_add_bridge()

Use the new generic pci_hp_add_bridge() interface.

[bhelgaas: changelog]
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Yinghai Lu 13 年之前
父节点
当前提交
2d7abf3292
共有 1 个文件被更改,包括 4 次插入6 次删除
  1. 4 6
      drivers/pci/hotplug/ibmphp_core.c

+ 4 - 6
drivers/pci/hotplug/ibmphp_core.c

@@ -775,7 +775,6 @@ static u8 bus_structure_fixup(u8 busno)
 
 
 static int ibm_configure_device(struct pci_func *func)
 static int ibm_configure_device(struct pci_func *func)
 {
 {
-	unsigned char bus;
 	struct pci_bus *child;
 	struct pci_bus *child;
 	int num;
 	int num;
 	int flag = 0;	/* this is to make sure we don't double scan the bus,
 	int flag = 0;	/* this is to make sure we don't double scan the bus,
@@ -805,11 +804,10 @@ static int ibm_configure_device(struct pci_func *func)
 		}
 		}
 	}
 	}
 	if (!(flag) && (func->dev->hdr_type == PCI_HEADER_TYPE_BRIDGE)) {
 	if (!(flag) && (func->dev->hdr_type == PCI_HEADER_TYPE_BRIDGE)) {
-		int max;
-		pci_read_config_byte(func->dev, PCI_SECONDARY_BUS, &bus);
-		child = pci_add_new_bus(func->dev->bus, func->dev, bus);
-		max = pci_do_scan_bus(child);
-		pci_bus_update_busn_res_end(child, max);
+		pci_hp_add_bridge(func->dev);
+		child = func->dev->subordinate;
+		if (child)
+			pci_bus_add_devices(child);
 	}
 	}
 
 
 	return 0;
 	return 0;