diff options
| author | Yijing Wang <wangyijing@huawei.com> | 2014-05-04 00:23:47 -0400 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-05-27 16:58:24 -0400 |
| commit | 56604faed1121733de58098db51fb5987f2390ee (patch) | |
| tree | da7657d98952bf9cdc84be5ee096dcf575f875da /drivers/pcmcia/cardbus.c | |
| parent | 930067e235f23c98e444615a03e1f01148cc6d71 (diff) | |
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>
Diffstat (limited to 'drivers/pcmcia/cardbus.c')
| -rw-r--r-- | drivers/pcmcia/cardbus.c | 3 |
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) | |||
| 78 | max = bus->busn_res.start; | 78 | max = bus->busn_res.start; |
| 79 | for (pass = 0; pass < 2; pass++) | 79 | for (pass = 0; pass < 2; pass++) |
| 80 | list_for_each_entry(dev, &bus->devices, bus_list) | 80 | list_for_each_entry(dev, &bus->devices, bus_list) |
| 81 | if (dev->hdr_type == PCI_HEADER_TYPE_BRIDGE || | 81 | if (pci_is_bridge(dev)) |
| 82 | dev->hdr_type == PCI_HEADER_TYPE_CARDBUS) | ||
| 83 | max = pci_scan_bridge(bus, dev, max, pass); | 82 | max = pci_scan_bridge(bus, dev, max, pass); |
| 84 | 83 | ||
| 85 | /* | 84 | /* |