aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-powerpc/prom.h
diff options
context:
space:
mode:
authorJeremy Kerr <jk@ozlabs.org>2006-07-12 01:35:54 -0400
committerPaul Mackerras <paulus@samba.org>2006-07-31 01:55:04 -0400
commita7f67bdf2c9f24509b8e81e0f35573b611987c80 (patch)
tree201662dd6504418ef3c84cfe1f280153a4d8cb29 /include/asm-powerpc/prom.h
parent4288b92b9644fdb4c6168273873fe08f32090d7a (diff)
[POWERPC] Constify & voidify get_property()
Now that get_property() returns a void *, there's no need to cast its return value. Also, treat the return value as const, so we can constify get_property later. powerpc core changes. Signed-off-by: Jeremy Kerr <jk@ozlabs.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'include/asm-powerpc/prom.h')
-rw-r--r--include/asm-powerpc/prom.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/include/asm-powerpc/prom.h b/include/asm-powerpc/prom.h
index 56f6ea0c76de..abdf1be66e97 100644
--- a/include/asm-powerpc/prom.h
+++ b/include/asm-powerpc/prom.h
@@ -72,8 +72,8 @@ struct property {
72}; 72};
73 73
74struct device_node { 74struct device_node {
75 char *name; 75 const char *name;
76 char *type; 76 const char *type;
77 phandle node; 77 phandle node;
78 phandle linux_phandle; 78 phandle linux_phandle;
79 char *full_name; 79 char *full_name;
@@ -209,15 +209,15 @@ static inline u64 of_read_number(const u32 *cell, int size)
209/* Translate an OF address block into a CPU physical address 209/* Translate an OF address block into a CPU physical address
210 */ 210 */
211#define OF_BAD_ADDR ((u64)-1) 211#define OF_BAD_ADDR ((u64)-1)
212extern u64 of_translate_address(struct device_node *np, u32 *addr); 212extern u64 of_translate_address(struct device_node *np, const u32 *addr);
213 213
214/* Extract an address from a device, returns the region size and 214/* Extract an address from a device, returns the region size and
215 * the address space flags too. The PCI version uses a BAR number 215 * the address space flags too. The PCI version uses a BAR number
216 * instead of an absolute index 216 * instead of an absolute index
217 */ 217 */
218extern u32 *of_get_address(struct device_node *dev, int index, 218extern const u32 *of_get_address(struct device_node *dev, int index,
219 u64 *size, unsigned int *flags); 219 u64 *size, unsigned int *flags);
220extern u32 *of_get_pci_address(struct device_node *dev, int bar_no, 220extern const u32 *of_get_pci_address(struct device_node *dev, int bar_no,
221 u64 *size, unsigned int *flags); 221 u64 *size, unsigned int *flags);
222 222
223/* Get an address as a resource. Note that if your address is 223/* Get an address as a resource. Note that if your address is
@@ -234,7 +234,7 @@ extern int of_pci_address_to_resource(struct device_node *dev, int bar,
234/* Parse the ibm,dma-window property of an OF node into the busno, phys and 234/* Parse the ibm,dma-window property of an OF node into the busno, phys and
235 * size parameters. 235 * size parameters.
236 */ 236 */
237void of_parse_dma_window(struct device_node *dn, unsigned char *dma_window_prop, 237void of_parse_dma_window(struct device_node *dn, const void *dma_window_prop,
238 unsigned long *busno, unsigned long *phys, unsigned long *size); 238 unsigned long *busno, unsigned long *phys, unsigned long *size);
239 239
240extern void kdump_move_device_tree(void); 240extern void kdump_move_device_tree(void);
@@ -288,8 +288,8 @@ extern void of_irq_map_init(unsigned int flags);
288 * 288 *
289 */ 289 */
290 290
291extern int of_irq_map_raw(struct device_node *parent, u32 *intspec, u32 *addr, 291extern int of_irq_map_raw(struct device_node *parent, const u32 *intspec,
292 struct of_irq *out_irq); 292 const u32 *addr, struct of_irq *out_irq);
293 293
294 294
295/*** 295/***