[PATCH 09/12] MIPS: BRIDGE: Use !pci_is_root_bus(bus) to check for bus->number > 0

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



From: Joshua Kinard <kumba@xxxxxxxxxx>

This is a manual cherrypick of commit c7ddc3d137b7 from Alastair
Bridgewater's IP35 tree.  In arch/mips/pci/ops-bridge.c, replace:
    if (bus->number > 0)
        foo();

With:
    if (!pci_is_root_bus(bus))
        foo();

Signed-off-by: Joshua Kinard <kumba@xxxxxxxxxx>
Cc: Alastair Bridgewater <alastair.bridgewater@xxxxxxxxx>
---
 arch/mips/pci/ops-bridge.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/mips/pci/ops-bridge.c b/arch/mips/pci/ops-bridge.c
index 6793a72edec2..28efce2dcb7d 100644
--- a/arch/mips/pci/ops-bridge.c
+++ b/arch/mips/pci/ops-bridge.c
@@ -170,7 +170,7 @@ static int
 pci_read_config(struct pci_bus *bus, u32 devfn, int where, int size,
 		u32 *value)
 {
-	if (bus->number > 0)
+	if (!pci_is_root_bus(bus))
 		return pci_conf1_read_config(bus, devfn, where, size, value);
 
 	return pci_conf0_read_config(bus, devfn, where, size, value);
@@ -314,7 +314,7 @@ static int
 pci_write_config(struct pci_bus *bus, u32 devfn, int where, int size,
 		 u32 value)
 {
-	if (bus->number > 0)
+	if (!pci_is_root_bus(bus))
 		return pci_conf1_write_config(bus, devfn, where, size, value);
 
 	return pci_conf0_write_config(bus, devfn, where, size, value);
-- 
2.11.1





[Index of Archives]     [Linux MIPS Home]     [LKML Archive]     [Linux ARM Kernel]     [Linux ARM]     [Linux]     [Git]     [Yosemite News]     [Linux SCSI]     [Linux Hams]

  Powered by Linux