summaryrefslogtreecommitdiff
path: root/arch/powerpc/kernel/of_device.c
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2010-04-13 16:12:56 -0700
committerGrant Likely <grant.likely@secretlab.ca>2010-05-18 16:10:45 -0600
commit58f9b0b02414062eaff46716bc04b47d7e79add5 (patch)
treefa5265f4c37c2f4afb42a126f39cccc9602e06a2 /arch/powerpc/kernel/of_device.c
parent61c7a080a5a061c976988fd4b844dfb468dda255 (diff)
of: eliminate of_device->node and dev_archdata->{of,prom}_node
This patch eliminates the node pointer from struct of_device and the of_node (or prom_node) pointer from struct dev_archdata since the node pointer is now part of struct device proper when CONFIG_OF is set, and all users of the old pointer locations have already been converted over to use device->of_node. Also remove dev_archdata_{get,set}_node() as it is no longer used by anything. Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'arch/powerpc/kernel/of_device.c')
-rw-r--r--arch/powerpc/kernel/of_device.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/powerpc/kernel/of_device.c b/arch/powerpc/kernel/of_device.c
index 285c8490c547..20b3474b6f6b 100644
--- a/arch/powerpc/kernel/of_device.c
+++ b/arch/powerpc/kernel/of_device.c
@@ -69,12 +69,10 @@ struct of_device *of_device_alloc(struct device_node *np,
if (!dev)
return NULL;
- dev->node = of_node_get(np);
+ dev->dev.of_node = of_node_get(np);
dev->dev.dma_mask = &dev->dma_mask;
dev->dev.parent = parent;
dev->dev.release = of_release_dev;
- dev->dev.archdata.of_node = np;
- dev->dev.of_node = np;
if (bus_id)
dev_set_name(&dev->dev, "%s", bus_id);