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: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/arch/sparc/include/asm/openprom_32.h b/arch/sparc/include/asm/openprom_32.h
index f8b4bf7216d79be5ad82a9d369a988be06eec170..2e58db557198d5d3bce59f5345807c9899bbbafa 100644 (file)
--- a/arch/sparc/include/asm/openprom_32.h
+++ b/arch/sparc/include/asm/openprom_32.h
@@ -47,7 +47,7 @@ struct linux_dev_v2_funcs {
 
 struct linux_mlist_v0 {
        struct linux_mlist_v0 *theres_more;
-       char *start_adr;
+       unsigned int start_adr;
        unsigned num_bytes;
 };
 
@@ -182,9 +182,9 @@ struct linux_nodeops {
 #define PROMINTR_MAX    15
 
 struct linux_prom_registers {
-       unsigned int which_io;         /* is this in OBIO space? */
-       unsigned int phys_addr;        /* The physical address of this register */
-       unsigned int reg_size;         /* How many bytes does this register take up? */
+       unsigned int which_io;  /* is this in OBIO space? */
+       unsigned int phys_addr; /* The physical address of this register */
+       unsigned int reg_size;  /* How many bytes does this register take up? */
 };
 
 struct linux_prom_irqs {

diff --git a/arch/sparc/include/asm/openprom_64.h b/arch/sparc/include/asm/openprom_64.h
index 955d7f6871941c61b69e085075ff53856db0c5c3..db3711e7e91d3e78b1596c6410c64916872f0a8e 100644 (file)
--- a/arch/sparc/include/asm/openprom_64.h
+++ b/arch/sparc/include/asm/openprom_64.h
@@ -44,7 +44,7 @@ struct linux_dev_v2_funcs {
 
 struct linux_mlist_v0 {
        struct linux_mlist_v0 *theres_more;
-       unsigned start_adr;
+       unsigned int start_adr;
        unsigned num_bytes;
 };
 
@@ -167,9 +167,9 @@ struct linux_romvec {
 struct linux_nodeops {
        int (*no_nextnode)(int node);
        int (*no_child)(int node);
-       int (*no_proplen)(int node, char *name);
-       int (*no_getprop)(int node, char *name, char *val);
-       int (*no_setprop)(int node, char *name, char *val, int len);
+       int (*no_proplen)(int node, const char *name);
+       int (*no_getprop)(int node, const char *name, char *val);
+       int (*no_setprop)(int node, const char *name, char *val, int len);
        char * (*no_nextprop)(int node, char *name);
 };
 
@@ -179,9 +179,9 @@ struct linux_nodeops {
 #define PROMINTR_MAX    32
 
 struct linux_prom_registers {
-       unsigned which_io;      /* hi part of physical address                  */
-       unsigned phys_addr;     /* The physical address of this register        */
-       int reg_size;           /* How many bytes does this register take up?   */
+       unsigned int which_io;  /* hi part of physical address */
+       unsigned int phys_addr; /* The physical address of this register */
+       unsigned int reg_size;  /* How many bytes does this register take up? */
 };
 
 struct linux_prom64_registers {