summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2013-04-15 14:26:15 -0600
committerBjorn Helgaas <bhelgaas@google.com>2013-04-15 14:26:15 -0600
commit272e70c0ded509906b7469ea0d487725ef1c17b3 (patch)
treefe14da14dffbe51dc689f9bac3e6e85c145a08bf
parent833260631178aa26c70a0b05eabc953f5e47167d (diff)
parent9a97cd43f4ef62520a852b5a2348233b0f37455b (diff)
downloadlinux-3.10-272e70c0ded509906b7469ea0d487725ef1c17b3.tar.gz
linux-3.10-272e70c0ded509906b7469ea0d487725ef1c17b3.tar.bz2
linux-3.10-272e70c0ded509906b7469ea0d487725ef1c17b3.zip
Merge branch 'pci/gabor-get-of-node' into next
* pci/gabor-get-of-node: MIPS/PCI: Implement pcibios_get_phb_of_node PCI: Remove __weak annotation from pcibios_get_phb_of_node decl
-rw-r--r--arch/mips/pci/pci.c8
-rw-r--r--include/linux/pci.h2
2 files changed, 8 insertions, 2 deletions
diff --git a/arch/mips/pci/pci.c b/arch/mips/pci/pci.c
index 0872f12f268..594e60d6a43 100644
--- a/arch/mips/pci/pci.c
+++ b/arch/mips/pci/pci.c
@@ -115,7 +115,6 @@ static void pcibios_scanbus(struct pci_controller *hose)
pci_bus_assign_resources(bus);
pci_enable_bridges(bus);
}
- bus->dev.of_node = hose->of_node;
}
}
@@ -169,6 +168,13 @@ void pci_load_of_ranges(struct pci_controller *hose, struct device_node *node)
}
}
}
+
+struct device_node *pcibios_get_phb_of_node(struct pci_bus *bus)
+{
+ struct pci_controller *hose = bus->sysdata;
+
+ return of_node_get(hose->of_node);
+}
#endif
static DEFINE_MUTEX(pci_scan_mutex);
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 849a336e149..bcd976976c3 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -1838,7 +1838,7 @@ extern void pci_set_bus_of_node(struct pci_bus *bus);
extern void pci_release_bus_of_node(struct pci_bus *bus);
/* Arch may override this (weak) */
-extern struct device_node * __weak pcibios_get_phb_of_node(struct pci_bus *bus);
+extern struct device_node *pcibios_get_phb_of_node(struct pci_bus *bus);
static inline struct device_node *
pci_device_to_OF_node(const struct pci_dev *pdev)