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

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

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 1c86438c

drivers/pci/pci-acpi.c

+1 −7
Original line number Diff line number Diff line
@@ -309,13 +309,7 @@ static struct acpi_device *acpi_pci_find_companion(struct device *dev) 
	bool check_children;

	u64 addr;



	/*

	 * pci_is_bridge() is not suitable here, because pci_dev->subordinate

	 * is set only after acpi_pci_find_device() has been called for the

	 * given device.

	 */

	check_children = pci_dev->hdr_type == PCI_HEADER_TYPE_BRIDGE

			|| pci_dev->hdr_type == PCI_HEADER_TYPE_CARDBUS;

	check_children = pci_is_bridge(pci_dev);

	/* Please ref to ACPI spec for the syntax of _ADR */

	addr = (PCI_SLOT(pci_dev->devfn) << 16) | PCI_FUNC(pci_dev->devfn);

	return acpi_find_child_device(ACPI_COMPANION(dev->parent), addr,

drivers/pci/probe.c

+1 −2
Original line number Diff line number Diff line
@@ -1670,8 +1670,7 @@ unsigned int pci_scan_child_bus(struct pci_bus *bus) 


	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);

		}

drivers/pci/setup-bus.c

+1 −3
Original line number Diff line number Diff line
@@ -1629,9 +1629,7 @@ void pci_assign_unassigned_bus_resources(struct pci_bus *bus) 


	down_read(&pci_bus_sem);

	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 (dev->subordinate)

		if (pci_is_bridge(dev) && pci_has_subordinate(dev))

				__pci_bus_size_bridges(dev->subordinate,

							 &add_list);

	up_read(&pci_bus_sem);