diff options
| author | Grant Likely <[email protected]> | 2010-04-13 16:12:28 -0700 |
|---|---|---|
| committer | Grant Likely <[email protected]> | 2010-04-28 18:20:57 -0600 |
| commit | d706c1b050274b3bf97d7cb0542c0d070c9ccb8b (patch) | |
| tree | 9104c28f9028589cc4b95d8846dfc3288dcbf289 /arch/powerpc/kernel/pci-common.c | |
| parent | efb2e014fc4f2675011b802e1a84bf9a58756004 (diff) | |
driver-core: Add device node pointer to struct device
Currently, platforms using CONFIG_OF add a 'struct device_node *of_node'
to dev->archdata. However, with CONFIG_OF becoming generic for all
architectures, it makes sense for commonality to move it out of archdata
and into struct device proper.
This patch adds a struct device_node *of_node member to struct device
and updates all locations which currently write the device_node pointer
into archdata to also update dev->of_node. Subsequent patches will
modify callers to use the archdata location and ultimately remove
the archdata member entirely.
Signed-off-by: Grant Likely <[email protected]>
Acked-by: Greg Kroah-Hartman <[email protected]>
CC: Michal Simek <[email protected]>
CC: Greg Kroah-Hartman <[email protected]>
CC: Benjamin Herrenschmidt <[email protected]>
CC: "David S. Miller" <[email protected]>
CC: Stephen Rothwell <[email protected]>
CC: Jeremy Kerr <[email protected]>
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
Diffstat (limited to 'arch/powerpc/kernel/pci-common.c')
| -rw-r--r-- | arch/powerpc/kernel/pci-common.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c index 0c0567e58409..88da282047c3 100644 --- a/arch/powerpc/kernel/pci-common.c +++ b/arch/powerpc/kernel/pci-common.c @@ -1097,8 +1097,9 @@ void __devinit pcibios_setup_bus_devices(struct pci_bus *bus) if (dev->is_added) continue; - /* Setup OF node pointer in archdata */ + /* Setup OF node pointer in the device */ sd->of_node = pci_device_to_OF_node(dev); + dev->dev.of_node = pci_device_to_OF_node(dev); /* Fixup NUMA node as it may not be setup yet by the generic * code and is needed by the DMA init |