Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c888770e authored by Yijing Wang's avatar Yijing Wang Committed by Bjorn Helgaas
Browse files

powerpc/PCI: Use pci_is_bridge() to simplify code 



Use pci_is_bridge() to simplify code.  No functional change.

Requires: 326c1cda PCI: Rename pci_is_bridge() to pci_has_subordinate()
Requires: 1c86438c PCI: Add new pci_is_bridge() interface
Signed-off-by: default avatarYijing Wang <wangyijing@huawei.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 11a3bd09

arch/powerpc/kernel/pci-hotplug.c

+1 −2
Original line number Diff line number Diff line
@@ -98,8 +98,7 @@ void pcibios_add_pci_devices(struct pci_bus * bus) 
		max = bus->busn_res.start;

		for (pass = 0; pass < 2; pass++) {

			list_for_each_entry(dev, &bus->devices, bus_list) {

				if (dev->hdr_type == PCI_HEADER_TYPE_BRIDGE ||

				    dev->hdr_type == PCI_HEADER_TYPE_CARDBUS)

				if (pci_is_bridge(dev))

					max = pci_scan_bridge(bus, dev,

							      max, pass);

			}

arch/powerpc/kernel/pci_of_scan.c

+1 −2
Original line number Diff line number Diff line
@@ -362,8 +362,7 @@ static void __of_scan_bus(struct device_node *node, struct pci_bus *bus, 


	/* Now scan child busses */

	list_for_each_entry(dev, &bus->devices, bus_list) {

		if (dev->hdr_type == PCI_HEADER_TYPE_BRIDGE ||

		    dev->hdr_type == PCI_HEADER_TYPE_CARDBUS) {

		if (pci_is_bridge(dev)) {

			of_scan_pci_bridge(dev);

		}

	}