Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 47cd5265 authored by Julian Calaby's avatar Julian Calaby Committed by David S. Miller
Browse files

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.

Signed-off-by: default avatarJulian Calaby <julian.calaby@gmail.com>
Reviewed-by: default avatarSam Ravnborg <sam@ravnborg.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 192eee8e

arch/sparc/kernel/prom_common.c

+3 −11
Original line number Diff line number Diff line
@@ -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;