diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2007-03-29 03:53:28 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-04-26 04:54:35 -0400 |
commit | 64b94701c0714f814e640ff351d5f784fdc0381e (patch) | |
tree | 2bb66f86ccec74533e40042f60aafe8551cae991 | |
parent | 3198514d2d10fb3ce5e49ba0c611764ad8a214d0 (diff) |
[SPARC/64]: constify of_get_property return
Finally, we actually change the functions themselves.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | arch/sparc/kernel/prom.c | 2 | ||||
-rw-r--r-- | arch/sparc64/kernel/prom.c | 2 | ||||
-rw-r--r-- | include/asm-sparc/prom.h | 2 | ||||
-rw-r--r-- | include/asm-sparc64/prom.h | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/arch/sparc/kernel/prom.c b/arch/sparc/kernel/prom.c index 8359d00a2489..d2a8297d56fa 100644 --- a/arch/sparc/kernel/prom.c +++ b/arch/sparc/kernel/prom.c | |||
@@ -170,7 +170,7 @@ EXPORT_SYMBOL(of_find_property); | |||
170 | * Find a property with a given name for a given node | 170 | * Find a property with a given name for a given node |
171 | * and return the value. | 171 | * and return the value. |
172 | */ | 172 | */ |
173 | void *of_get_property(struct device_node *np, const char *name, int *lenp) | 173 | const void *of_get_property(struct device_node *np, const char *name, int *lenp) |
174 | { | 174 | { |
175 | struct property *pp = of_find_property(np,name,lenp); | 175 | struct property *pp = of_find_property(np,name,lenp); |
176 | return pp ? pp->value : NULL; | 176 | return pp ? pp->value : NULL; |
diff --git a/arch/sparc64/kernel/prom.c b/arch/sparc64/kernel/prom.c index 25b70368973c..493db961a1f6 100644 --- a/arch/sparc64/kernel/prom.c +++ b/arch/sparc64/kernel/prom.c | |||
@@ -174,7 +174,7 @@ EXPORT_SYMBOL(of_find_property); | |||
174 | * Find a property with a given name for a given node | 174 | * Find a property with a given name for a given node |
175 | * and return the value. | 175 | * and return the value. |
176 | */ | 176 | */ |
177 | void *of_get_property(struct device_node *np, const char *name, int *lenp) | 177 | const void *of_get_property(struct device_node *np, const char *name, int *lenp) |
178 | { | 178 | { |
179 | struct property *pp = of_find_property(np,name,lenp); | 179 | struct property *pp = of_find_property(np,name,lenp); |
180 | return pp ? pp->value : NULL; | 180 | return pp ? pp->value : NULL; |
diff --git a/include/asm-sparc/prom.h b/include/asm-sparc/prom.h index 274868d8598d..30d53ed4f5cd 100644 --- a/include/asm-sparc/prom.h +++ b/include/asm-sparc/prom.h | |||
@@ -89,7 +89,7 @@ extern struct property *of_find_property(struct device_node *np, | |||
89 | const char *name, | 89 | const char *name, |
90 | int *lenp); | 90 | int *lenp); |
91 | extern int of_device_is_compatible(struct device_node *device, const char *); | 91 | extern int of_device_is_compatible(struct device_node *device, const char *); |
92 | extern void *of_get_property(struct device_node *node, const char *name, | 92 | extern const void *of_get_property(struct device_node *node, const char *name, |
93 | int *lenp); | 93 | int *lenp); |
94 | #define get_property(node,name,lenp) of_get_property(node,name,lenp) | 94 | #define get_property(node,name,lenp) of_get_property(node,name,lenp) |
95 | extern int of_set_property(struct device_node *node, const char *name, void *val, int len); | 95 | extern int of_set_property(struct device_node *node, const char *name, void *val, int len); |
diff --git a/include/asm-sparc64/prom.h b/include/asm-sparc64/prom.h index 0eca2d98627f..50b03387c97b 100644 --- a/include/asm-sparc64/prom.h +++ b/include/asm-sparc64/prom.h | |||
@@ -97,8 +97,8 @@ extern struct property *of_find_property(struct device_node *np, | |||
97 | const char *name, | 97 | const char *name, |
98 | int *lenp); | 98 | int *lenp); |
99 | extern int of_device_is_compatible(struct device_node *device, const char *); | 99 | extern int of_device_is_compatible(struct device_node *device, const char *); |
100 | extern void *of_get_property(struct device_node *node, const char *name, | 100 | extern const void *of_get_property(struct device_node *node, const char *name, |
101 | int *lenp); | 101 | int *lenp); |
102 | #define get_property(node,name,lenp) of_get_property(node,name,lenp) | 102 | #define get_property(node,name,lenp) of_get_property(node,name,lenp) |
103 | extern int of_set_property(struct device_node *node, const char *name, void *val, int len); | 103 | extern int of_set_property(struct device_node *node, const char *name, void *val, int len); |
104 | extern int of_getintprop_default(struct device_node *np, | 104 | extern int of_getintprop_default(struct device_node *np, |