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

arch/mips/pci/pci.c

···
 			pci_bus_assign_resources(bus);
 			pci_enable_bridges(bus);
 		}
-		bus->dev.of_node = hose->of_node;
 	}
 }
 
···
 			res->child = NULL;
 		}
 	}
+}
+
+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
 

include/linux/pci.h

···
 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)