From: Yijing Wang Date: Sun, 4 May 2014 04:23:43 +0000 (+0800) Subject: PCI: rpaphp: Use pci_is_bridge() to simplify code X-Git-Tag: firefly_0821_release~176^2~3767^2~6^3~5 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f86e1f152e949b24ef336c640009183c01cfd9bf;p=firefly-linux-kernel-4.4.55.git PCI: rpaphp: Use pci_is_bridge() to simplify code Use pci_is_bridge() to simplify code. No functional change. Requires: 326c1cdae741 PCI: Rename pci_is_bridge() to pci_has_subordinate() Requires: 1c86438c9423 PCI: Add new pci_is_bridge() interface Signed-off-by: Yijing Wang Signed-off-by: Bjorn Helgaas Acked-by: Benjamin Herrenschmidt --- diff --git a/drivers/pci/hotplug/rpadlpar_core.c b/drivers/pci/hotplug/rpadlpar_core.c index 4fcdeedda31b..7660232ef460 100644 --- a/drivers/pci/hotplug/rpadlpar_core.c +++ b/drivers/pci/hotplug/rpadlpar_core.c @@ -157,8 +157,7 @@ static void dlpar_pci_add_bus(struct device_node *dn) } /* Scan below the new bridge */ - 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); /* Map IO space for child bus, which may or may not succeed */