diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2010-04-13 19:12:56 -0400 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2010-05-18 18:10:45 -0400 |
commit | 58f9b0b02414062eaff46716bc04b47d7e79add5 (patch) | |
tree | fa5265f4c37c2f4afb42a126f39cccc9602e06a2 /arch/sparc/include | |
parent | 61c7a080a5a061c976988fd4b844dfb468dda255 (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/sparc/include')
-rw-r--r-- | arch/sparc/include/asm/device.h | 15 | ||||
-rw-r--r-- | arch/sparc/include/asm/of_device.h | 1 |
2 files changed, 0 insertions, 16 deletions
diff --git a/arch/sparc/include/asm/device.h b/arch/sparc/include/asm/device.h index f3b85b6b0b76..d4c452147412 100644 --- a/arch/sparc/include/asm/device.h +++ b/arch/sparc/include/asm/device.h | |||
@@ -13,25 +13,10 @@ struct dev_archdata { | |||
13 | void *iommu; | 13 | void *iommu; |
14 | void *stc; | 14 | void *stc; |
15 | void *host_controller; | 15 | void *host_controller; |
16 | |||
17 | struct device_node *prom_node; | ||
18 | struct of_device *op; | 16 | struct of_device *op; |
19 | |||
20 | int numa_node; | 17 | int numa_node; |
21 | }; | 18 | }; |
22 | 19 | ||
23 | static inline void dev_archdata_set_node(struct dev_archdata *ad, | ||
24 | struct device_node *np) | ||
25 | { | ||
26 | ad->prom_node = np; | ||
27 | } | ||
28 | |||
29 | static inline struct device_node * | ||
30 | dev_archdata_get_node(const struct dev_archdata *ad) | ||
31 | { | ||
32 | return ad->prom_node; | ||
33 | } | ||
34 | |||
35 | struct pdev_archdata { | 20 | struct pdev_archdata { |
36 | }; | 21 | }; |
37 | 22 | ||
diff --git a/arch/sparc/include/asm/of_device.h b/arch/sparc/include/asm/of_device.h index a5d9811f9697..f320246a0586 100644 --- a/arch/sparc/include/asm/of_device.h +++ b/arch/sparc/include/asm/of_device.h | |||
@@ -14,7 +14,6 @@ | |||
14 | */ | 14 | */ |
15 | struct of_device | 15 | struct of_device |
16 | { | 16 | { |
17 | struct device_node *node; | ||
18 | struct device dev; | 17 | struct device dev; |
19 | struct resource resource[PROMREG_MAX]; | 18 | struct resource resource[PROMREG_MAX]; |
20 | unsigned int irqs[PROMINTR_MAX]; | 19 | unsigned int irqs[PROMINTR_MAX]; |