summaryrefslogtreecommitdiffstats
path: root/drivers/pci
diff options
context:
space:
mode:
authorYijing Wang <wangyijing@huawei.com>2014-05-04 12:23:46 +0800
committerBjorn Helgaas <bhelgaas@google.com>2014-05-27 14:58:13 -0600
commitc7a071f6a9f02c9fd2d0aa81d000c814a7adb914 (patch)
tree815d546a8fc2f40b0f81f113af32877ae4485c6e /drivers/pci
parent5cbe5d15aefcd57038a90aa8db4787bc84968941 (diff)
downloadop-kernel-dev-c7a071f6a9f02c9fd2d0aa81d000c814a7adb914.zip
op-kernel-dev-c7a071f6a9f02c9fd2d0aa81d000c814a7adb914.tar.gz
PCI: acpiphp: 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 <wangyijing@huawei.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Diffstat (limited to 'drivers/pci')
-rw-r--r--drivers/pci/hotplug/acpiphp_glue.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
index bccc27e..f1f9bd1 100644
--- a/drivers/pci/hotplug/acpiphp_glue.c
+++ b/drivers/pci/hotplug/acpiphp_glue.c
@@ -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);
OpenPOWER on IntegriCloud