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

pcmcia: 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 930067e2

drivers/pcmcia/cardbus.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -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);

		/*