Commit 272e70c0 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

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
parents 83326063 9a97cd43

arch/mips/pci/pci.c

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

include/linux/pci.h

+1 −1
Original line number Diff line number Diff line
@@ -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)