Skip to contentSkip to conversation

sparc: Clean arch-specific code in prom_common.c

PATCH In review Julian Calaby 3 participants 5 messages Jan 4, 2009 – Jan 5, 2009 SPARC + UltraSPARC (sparc/sparc64)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 sparc: Clean arch-specific code in prom_common.c

sparc: Clean arch-specific code in prom_common.c

prom_nextprop() and prom_firstprop() have slightly different calling conventions in 32 and 64 bit SPARC.

prom_common.c uses a ifdef guard to ensure that these functions are called correctly.

Adjust code to eliminate this ifdef by using a calling convention that is compatible with both 32 and 64 bit SPARC.

---

This has been build tested on sparc64 native, however I'm yet to boot it.

It hasn't been checked with sparc32 as I lack a working build environment.

  arch/sparc/kernel/prom_common.c |   14 +++-----------
  1 files changed, 3 insertions(+), 11 deletions(-)
(quoted diff) +0 -0

b/arch/sparc/kernel/prom_common.c
index 4e9af59..ff7b591 100644

arch/sparc/kernel/prom_common.c +0 -0
@@ -155,20 +155,12 @@ static struct property * __init 

build_one_prop(phandle node, char *prev,
p->value = prom_early_alloc(special_len); memcpy(p->value, special_val, special_len);
} else {
-#ifdef CONFIG_SPARC32
- if (prev = NULL) {
- name = prom_firstprop(node, NULL);
- } else {
- name = prom_nextprop(node, prev, NULL);
- }
-#else
if (prev = NULL) {
- prom_firstprop(node, p->name);
+ name = prom_firstprop(node, p->name);
} else {
- prom_nextprop(node, prev, p->name);
+ name = prom_nextprop(node, prev, p->name);
}
- name = p->name;
-#endif
+
if (strlen(name) = 0) {
tmp = p;
return NULL;

#1 lore raw
Quoted 1 line · Julian Calaby

This has been build tested on sparc64 native, however I'm yet to boot it.

I've now booted an image based upon this and it works perfectly so far.

Thanks,

Signature · 3 lines
Julian Calaby

Email: [email protected]
Reviewed-by on v1 1/1
#2 lore raw
In reply to Julian Calaby
Quoted 5 lines · Julian Calaby

sparc: Clean arch-specific code in prom_common.c

prom_nextprop() and prom_firstprop() have slightly different calling conventions in 32 and 64 bit SPARC.

Quoted 7 lines

prom_common.c uses a ifdef guard to ensure that these functions are called correctly.

Adjust code to eliminate this ifdef by using a calling convention that is compatible with both 32 and 64 bit SPARC.

Looks good.

As a natural next step you could eliminate the following:

#ifdef CONFIG_SPARC32
                strcpy(p->name, name);

#endif

by moving this strcpy() to the prom_* functions
for sparc32.

Sam

#3 lore raw
In reply to Julian Calaby
Quoted 2 lines · Sam Ravnborg

Looks good.

Thanks!

Quoted 7 lines

As a natural next step you could eliminate the following:

#ifdef CONFIG_SPARC32
               strcpy(p->name, name);

#endif

by moving this strcpy() to the prom_* functions
for sparc32.

It's happening soon, but there's other changes that have to happen at the same time to have it not be useless code, so that's happening with some of the cleanups of the prom/tree_*.c files prior to their unification.

Thanks,

Signature · 3 lines
Julian Calaby

Email: [email protected]
maintainer
#4 lore raw
In reply to Julian Calaby

From: Sam Ravnborg <[email protected]>
Date: Sun, 4 Jan 2009 09:51:12 +0100

Quoted 9 lines · Julian Calaby
Quoted 8 lines

sparc: Clean arch-specific code in prom_common.c

prom_nextprop() and prom_firstprop() have slightly different calling conventions in 32 and 64 bit SPARC.

prom_common.c uses a ifdef guard to ensure that these functions are called correctly.

Quoted 7 lines
Quoted 4 lines

Adjust code to eliminate this ifdef by using a calling convention that is compatible with both 32 and 64 bit SPARC.

Looks good.

Looks good to me too, applied.

Thanks everyone.