summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYijing Wang <wangyijing@huawei.com>2014-05-04 12:23:47 +0800
committerBjorn Helgaas <bhelgaas@google.com>2014-05-27 14:58:24 -0600
commit56604faed1121733de58098db51fb5987f2390ee (patch)
treeda7657d98952bf9cdc84be5ee096dcf575f875da
parent930067e235f23c98e444615a03e1f01148cc6d71 (diff)
downloadlinux-56604faed1121733de58098db51fb5987f2390ee.tar.gz
linux-56604faed1121733de58098db51fb5987f2390ee.tar.bz2
linux-56604faed1121733de58098db51fb5987f2390ee.zip
pcmcia: 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>
-rw-r--r--drivers/pcmcia/cardbus.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/pcmcia/cardbus.c b/drivers/pcmcia/cardbus.c
index 8bde61952d20..4fe4cc4ae19a 100644
--- a/drivers/pcmcia/cardbus.c
+++ b/drivers/pcmcia/cardbus.c
@@ -78,8 +78,7 @@ int __ref cb_alloc(struct pcmcia_socket *s)
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);
/*