From: Wei Yang <weiyang@linux.vnet.ibm.com>
Date: Fri, 6 Sep 2013 01:45:56 +0000 (+0800)
Subject: PCI: Use pci_is_root_bus() to check for root bus
X-Git-Tag: MMI-PSA29.97-13-9~13289^2~9^2~6
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2ba29e270e977b213a7d58ae1152c23a1c3074a3;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

PCI: Use pci_is_root_bus() to check for root bus

In __pci_bus_size_bridges() we check whether a bus is a root bus by testing
bus->self.  As indicated by commit 79af72d7 ("PCI: pci_is_root_bus
helper"), bus->self == NULL is not a proper way to check for a root bus.
One issue is that "virtual" buses added for SR-IOV (via virtfn_add_bus())
have bus->self == NULL but are not root buses.

This patch changes it to pci_is_root_bus() to check whether it is a root
bus.

[bhelgaas: changelog]
Signed-off-by: Wei Yang <weiyang@linux.vnet.ibm.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
---

diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index bc26d7990cc3..8df686c48bd1 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -1136,7 +1136,7 @@ void __ref __pci_bus_size_bridges(struct pci_bus *bus,
 	}
 
 	/* The root bus? */
-	if (!bus->self)
+	if (pci_is_root_bus(bus))
 		return;
 
 	switch (bus->self->class >> 8) {