Skip to contentSkip to conversation

powerpc and sparc: Introduce dev_archdata node accessors

PATCH In review Anton Vorontsov 2 participants 2 messages Nov 28, 2008 – Nov 30, 2008

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 powerpc and sparc: Introduce dev_archdata node accessors

The name of the device_node field differ across the platforms, so we have to implement inlined accessors. This is needed to avoid ugly #ifdef in the generic code.

---
 arch/powerpc/include/asm/device.h |   12 ++++++++++++
 arch/sparc/include/asm/device.h   |   12 ++++++++++++
 2 files changed, 24 insertions(+), 0 deletions(-)
arch/powerpc/include/asm/device.h +12 -0
index dfd504c..7d2277c 100644
@@ -18,4 +18,16 @@ struct dev_archdata {
 	void			*dma_data;
 };
 
+static inline void dev_archdata_set_node(struct dev_archdata *ad,
+					 struct device_node *np)
+{
+	ad->of_node = np;
+}
+
+static inline struct device_node *
+dev_archdata_get_node(const struct dev_archdata *ad)
+{
+	return ad->of_node;
+}
+
 #endif /* _ASM_POWERPC_DEVICE_H */
arch/sparc/include/asm/device.h +12 -0
index 19790eb..3702e08 100644
@@ -20,4 +20,16 @@ struct dev_archdata {
 	int			numa_node;
 };
 
+static inline void dev_archdata_set_node(struct dev_archdata *ad,
+					 struct device_node *np)
+{
+	ad->prom_node = np;
+}
+
+static inline struct device_node *
+dev_archdata_get_node(const struct dev_archdata *ad)
+{
+	return ad->prom_node;
+}
+
 #endif /* _ASM_SPARC_DEVICE_H */
Signature · 1 line
1.5.6.5
#1 lore raw
Quoted 3 lines · Anton Vorontsov

The name of the device_node field differ across the platforms, so we have to implement inlined accessors. This is needed to avoid ugly #ifdef in the generic code.

My grep skills may not be 1337 enough, but I only see maybe three uses of arch_data.prom_node in arch/sparc:

# git grep "\.prom_node" arch/sparc/ 
arch/sparc/include/asm/fb.h:    node = dev->archdata.prom_node;
arch/sparc/kernel/smp.c:        cpu_data(id).prom_node = cpu_node;
arch/sparc/kernel/of_device.c:  sd->prom_node = dp;

And about 15 in arch/powerpc.

Would it be simpler to have sparc use "of_node"? DaveM?

cheers

Signature · 8 lines
Michael Ellerman
OzLabs, IBM Australia Development Lab

wwweb: http://michael.ellerman.id.au
phone: +61 2 6212 1183 (tie line 70 21183)

We do not inherit the earth from our ancestors,
we borrow it from our children. - S.M.A.R.T Person