diff options
-rw-r--r-- | arch/sparc/kernel/ebus.c | 10 | ||||
-rw-r--r-- | arch/sparc/kernel/of_device.c | 21 | ||||
-rw-r--r-- | arch/sparc/kernel/prom.c | 6 | ||||
-rw-r--r-- | arch/sparc/kernel/time.c | 2 |
4 files changed, 20 insertions, 19 deletions
diff --git a/arch/sparc/kernel/ebus.c b/arch/sparc/kernel/ebus.c index ba58c3a061fd..7724e2067159 100644 --- a/arch/sparc/kernel/ebus.c +++ b/arch/sparc/kernel/ebus.c | |||
@@ -86,8 +86,8 @@ int __init ebus_blacklist_irq(char *name) | |||
86 | void __init fill_ebus_child(struct device_node *dp, | 86 | void __init fill_ebus_child(struct device_node *dp, |
87 | struct linux_ebus_child *dev) | 87 | struct linux_ebus_child *dev) |
88 | { | 88 | { |
89 | int *regs; | 89 | const int *regs; |
90 | int *irqs; | 90 | const int *irqs; |
91 | int i, len; | 91 | int i, len; |
92 | 92 | ||
93 | dev->prom_node = dp; | 93 | dev->prom_node = dp; |
@@ -146,9 +146,9 @@ void __init fill_ebus_child(struct device_node *dp, | |||
146 | 146 | ||
147 | void __init fill_ebus_device(struct device_node *dp, struct linux_ebus_device *dev) | 147 | void __init fill_ebus_device(struct device_node *dp, struct linux_ebus_device *dev) |
148 | { | 148 | { |
149 | struct linux_prom_registers *regs; | 149 | const struct linux_prom_registers *regs; |
150 | struct linux_ebus_child *child; | 150 | struct linux_ebus_child *child; |
151 | int *irqs; | 151 | const int *irqs; |
152 | int i, n, len; | 152 | int i, n, len; |
153 | unsigned long baseaddr; | 153 | unsigned long baseaddr; |
154 | 154 | ||
@@ -269,7 +269,7 @@ void __init fill_ebus_device(struct device_node *dp, struct linux_ebus_device *d | |||
269 | 269 | ||
270 | void __init ebus_init(void) | 270 | void __init ebus_init(void) |
271 | { | 271 | { |
272 | struct linux_prom_pci_registers *regs; | 272 | const struct linux_prom_pci_registers *regs; |
273 | struct linux_pbm_info *pbm; | 273 | struct linux_pbm_info *pbm; |
274 | struct linux_ebus_device *dev; | 274 | struct linux_ebus_device *dev; |
275 | struct linux_ebus *ebus; | 275 | struct linux_ebus *ebus; |
diff --git a/arch/sparc/kernel/of_device.c b/arch/sparc/kernel/of_device.c index 48c24f7518c2..fd7f8cb668a3 100644 --- a/arch/sparc/kernel/of_device.c +++ b/arch/sparc/kernel/of_device.c | |||
@@ -210,7 +210,7 @@ struct of_bus { | |||
210 | int *addrc, int *sizec); | 210 | int *addrc, int *sizec); |
211 | int (*map)(u32 *addr, const u32 *range, | 211 | int (*map)(u32 *addr, const u32 *range, |
212 | int na, int ns, int pna); | 212 | int na, int ns, int pna); |
213 | unsigned int (*get_flags)(u32 *addr); | 213 | unsigned int (*get_flags)(const u32 *addr); |
214 | }; | 214 | }; |
215 | 215 | ||
216 | /* | 216 | /* |
@@ -270,7 +270,7 @@ static int of_bus_default_map(u32 *addr, const u32 *range, | |||
270 | return 0; | 270 | return 0; |
271 | } | 271 | } |
272 | 272 | ||
273 | static unsigned int of_bus_default_get_flags(u32 *addr) | 273 | static unsigned int of_bus_default_get_flags(const u32 *addr) |
274 | { | 274 | { |
275 | return IORESOURCE_MEM; | 275 | return IORESOURCE_MEM; |
276 | } | 276 | } |
@@ -334,7 +334,7 @@ static int of_bus_pci_map(u32 *addr, const u32 *range, | |||
334 | return 0; | 334 | return 0; |
335 | } | 335 | } |
336 | 336 | ||
337 | static unsigned int of_bus_pci_get_flags(u32 *addr) | 337 | static unsigned int of_bus_pci_get_flags(const u32 *addr) |
338 | { | 338 | { |
339 | unsigned int flags = 0; | 339 | unsigned int flags = 0; |
340 | u32 w = addr[0]; | 340 | u32 w = addr[0]; |
@@ -375,7 +375,7 @@ static int of_bus_sbus_map(u32 *addr, const u32 *range, int na, int ns, int pna) | |||
375 | return of_bus_default_map(addr, range, na, ns, pna); | 375 | return of_bus_default_map(addr, range, na, ns, pna); |
376 | } | 376 | } |
377 | 377 | ||
378 | static unsigned int of_bus_sbus_get_flags(u32 *addr) | 378 | static unsigned int of_bus_sbus_get_flags(const u32 *addr) |
379 | { | 379 | { |
380 | return IORESOURCE_MEM; | 380 | return IORESOURCE_MEM; |
381 | } | 381 | } |
@@ -432,7 +432,7 @@ static int __init build_one_resource(struct device_node *parent, | |||
432 | u32 *addr, | 432 | u32 *addr, |
433 | int na, int ns, int pna) | 433 | int na, int ns, int pna) |
434 | { | 434 | { |
435 | u32 *ranges; | 435 | const u32 *ranges; |
436 | unsigned int rlen; | 436 | unsigned int rlen; |
437 | int rone; | 437 | int rone; |
438 | 438 | ||
@@ -470,7 +470,7 @@ static void __init build_device_resources(struct of_device *op, | |||
470 | struct of_bus *bus; | 470 | struct of_bus *bus; |
471 | int na, ns; | 471 | int na, ns; |
472 | int index, num_reg; | 472 | int index, num_reg; |
473 | void *preg; | 473 | const void *preg; |
474 | 474 | ||
475 | if (!parent) | 475 | if (!parent) |
476 | return; | 476 | return; |
@@ -492,7 +492,7 @@ static void __init build_device_resources(struct of_device *op, | |||
492 | for (index = 0; index < num_reg; index++) { | 492 | for (index = 0; index < num_reg; index++) { |
493 | struct resource *r = &op->resource[index]; | 493 | struct resource *r = &op->resource[index]; |
494 | u32 addr[OF_MAX_ADDR_CELLS]; | 494 | u32 addr[OF_MAX_ADDR_CELLS]; |
495 | u32 *reg = (preg + (index * ((na + ns) * 4))); | 495 | const u32 *reg = (preg + (index * ((na + ns) * 4))); |
496 | struct device_node *dp = op->node; | 496 | struct device_node *dp = op->node; |
497 | struct device_node *pp = p_op->node; | 497 | struct device_node *pp = p_op->node; |
498 | struct of_bus *pbus, *dbus; | 498 | struct of_bus *pbus, *dbus; |
@@ -559,7 +559,7 @@ static struct of_device * __init scan_one_device(struct device_node *dp, | |||
559 | struct device *parent) | 559 | struct device *parent) |
560 | { | 560 | { |
561 | struct of_device *op = kzalloc(sizeof(*op), GFP_KERNEL); | 561 | struct of_device *op = kzalloc(sizeof(*op), GFP_KERNEL); |
562 | struct linux_prom_irqs *intr; | 562 | const struct linux_prom_irqs *intr; |
563 | int len, i; | 563 | int len, i; |
564 | 564 | ||
565 | if (!op) | 565 | if (!op) |
@@ -579,7 +579,8 @@ static struct of_device * __init scan_one_device(struct device_node *dp, | |||
579 | for (i = 0; i < op->num_irqs; i++) | 579 | for (i = 0; i < op->num_irqs; i++) |
580 | op->irqs[i] = intr[i].pri; | 580 | op->irqs[i] = intr[i].pri; |
581 | } else { | 581 | } else { |
582 | unsigned int *irq = of_get_property(dp, "interrupts", &len); | 582 | const unsigned int *irq = |
583 | of_get_property(dp, "interrupts", &len); | ||
583 | 584 | ||
584 | if (irq) { | 585 | if (irq) { |
585 | op->num_irqs = len / sizeof(unsigned int); | 586 | op->num_irqs = len / sizeof(unsigned int); |
@@ -594,7 +595,7 @@ static struct of_device * __init scan_one_device(struct device_node *dp, | |||
594 | 0, 0, 1, 2, 0, 3, 0, 4, 0, 5, 0, 6, 0, 7, 0, 0, | 595 | 0, 0, 1, 2, 0, 3, 0, 4, 0, 5, 0, 6, 0, 7, 0, 0, |
595 | }; | 596 | }; |
596 | struct device_node *io_unit, *sbi = dp->parent; | 597 | struct device_node *io_unit, *sbi = dp->parent; |
597 | struct linux_prom_registers *regs; | 598 | const struct linux_prom_registers *regs; |
598 | int board, slot; | 599 | int board, slot; |
599 | 600 | ||
600 | while (sbi) { | 601 | while (sbi) { |
diff --git a/arch/sparc/kernel/prom.c b/arch/sparc/kernel/prom.c index 2cc302b6bec0..8359d00a2489 100644 --- a/arch/sparc/kernel/prom.c +++ b/arch/sparc/kernel/prom.c | |||
@@ -37,7 +37,7 @@ int of_device_is_compatible(struct device_node *device, const char *compat) | |||
37 | const char* cp; | 37 | const char* cp; |
38 | int cplen, l; | 38 | int cplen, l; |
39 | 39 | ||
40 | cp = (char *) of_get_property(device, "compatible", &cplen); | 40 | cp = of_get_property(device, "compatible", &cplen); |
41 | if (cp == NULL) | 41 | if (cp == NULL) |
42 | return 0; | 42 | return 0; |
43 | while (cplen > 0) { | 43 | while (cplen > 0) { |
@@ -192,7 +192,7 @@ EXPORT_SYMBOL(of_getintprop_default); | |||
192 | 192 | ||
193 | int of_n_addr_cells(struct device_node *np) | 193 | int of_n_addr_cells(struct device_node *np) |
194 | { | 194 | { |
195 | int* ip; | 195 | const int* ip; |
196 | do { | 196 | do { |
197 | if (np->parent) | 197 | if (np->parent) |
198 | np = np->parent; | 198 | np = np->parent; |
@@ -207,7 +207,7 @@ EXPORT_SYMBOL(of_n_addr_cells); | |||
207 | 207 | ||
208 | int of_n_size_cells(struct device_node *np) | 208 | int of_n_size_cells(struct device_node *np) |
209 | { | 209 | { |
210 | int* ip; | 210 | const int* ip; |
211 | do { | 211 | do { |
212 | if (np->parent) | 212 | if (np->parent) |
213 | np = np->parent; | 213 | np = np->parent; |
diff --git a/arch/sparc/kernel/time.c b/arch/sparc/kernel/time.c index 9bb1240aaf8a..f1401b57ccc7 100644 --- a/arch/sparc/kernel/time.c +++ b/arch/sparc/kernel/time.c | |||
@@ -301,7 +301,7 @@ static __inline__ void sun4_clock_probe(void) | |||
301 | static int __devinit clock_probe(struct of_device *op, const struct of_device_id *match) | 301 | static int __devinit clock_probe(struct of_device *op, const struct of_device_id *match) |
302 | { | 302 | { |
303 | struct device_node *dp = op->node; | 303 | struct device_node *dp = op->node; |
304 | char *model = of_get_property(dp, "model", NULL); | 304 | const char *model = of_get_property(dp, "model", NULL); |
305 | 305 | ||
306 | if (!model) | 306 | if (!model) |
307 | return -ENODEV; | 307 | return -ENODEV; |