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

Commit bb5b52bb authored by Sam Ravnborg's avatar Sam Ravnborg Committed by David S. Miller
Browse files

sparc: prepare openprom for unification 



Align the sparc and sparc64 versions so differences are minimal.
A few data types are changed to better reflect there actual usage.

Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b608c3fe

arch/sparc/include/asm/openprom_32.h

+4 −4
Original line number Original line Diff line number Diff line
@@ -47,7 +47,7 @@ struct linux_dev_v2_funcs { 




struct linux_mlist_v0 {

struct linux_mlist_v0 {

	struct linux_mlist_v0 *theres_more;

	struct linux_mlist_v0 *theres_more;

	char *start_adr;

	unsigned int start_adr;

	unsigned num_bytes;

	unsigned num_bytes;

};

};

arch/sparc/include/asm/openprom_64.h

+7 −7
Original line number Original line Diff line number Diff line
@@ -44,7 +44,7 @@ struct linux_dev_v2_funcs { 




struct linux_mlist_v0 {

struct linux_mlist_v0 {

	struct linux_mlist_v0 *theres_more;

	struct linux_mlist_v0 *theres_more;

	unsigned start_adr;

	unsigned int start_adr;

	unsigned num_bytes;

	unsigned num_bytes;

};

};
@@ -167,9 +167,9 @@ struct linux_romvec { 
struct linux_nodeops {

struct linux_nodeops {

	int (*no_nextnode)(int node);

	int (*no_nextnode)(int node);

	int (*no_child)(int node);

	int (*no_child)(int node);

	int (*no_proplen)(int node, char *name);

	int (*no_proplen)(int node, const char *name);

	int (*no_getprop)(int node, char *name, char *val);

	int (*no_getprop)(int node, const char *name, char *val);

	int (*no_setprop)(int node, char *name, char *val, int len);

	int (*no_setprop)(int node, const char *name, char *val, int len);

	char * (*no_nextprop)(int node, char *name);

	char * (*no_nextprop)(int node, char *name);

};

};
@@ -179,9 +179,9 @@ struct linux_nodeops { 
#define PROMINTR_MAX    32

#define PROMINTR_MAX    32





struct linux_prom_registers {

struct linux_prom_registers {

	unsigned which_io;	/* hi part of physical address			*/

	unsigned int which_io;	/* hi part of physical address */

	unsigned phys_addr;	/* The physical address of this register	*/

	unsigned int phys_addr;	/* The physical address of this register */

	int reg_size;		/* How many bytes does this register take up?	*/

	unsigned int reg_size;	/* How many bytes does this register take up? */

};

};





struct linux_prom64_registers {

struct linux_prom64_registers {