Commit c7a071f6 authored May 04, 2014 by Yijing Wang Committed by Bjorn Helgaas May 27, 2014

PCI: acpiphp: 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: Yijing Wang <wangyijing@huawei.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

parent 5cbe5d15

drivers/pci/hotplug/acpiphp_glue.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -516,8 +516,7 @@ static void __ref enable_slot(struct acpiphp_slot *slot)
		if (PCI_SLOT(dev->devfn) != slot->device)
		continue;

		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);
		if (pass && dev->subordinate) {
		check_hotplug_bridge(slot, dev);