Commit 8271f042 authored by Stephen Rothwell's avatar Stephen Rothwell Committed by David S. Miller

[SPARC]: constify of_get_property return: arch/sparc

Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 644923d4
...@@ -86,8 +86,8 @@ int __init ebus_blacklist_irq(char *name) ...@@ -86,8 +86,8 @@ int __init ebus_blacklist_irq(char *name)
void __init fill_ebus_child(struct device_node *dp, void __init fill_ebus_child(struct device_node *dp,
struct linux_ebus_child *dev) struct linux_ebus_child *dev)
{ {
int *regs; const int *regs;
int *irqs; const int *irqs;
int i, len; int i, len;
dev->prom_node = dp; dev->prom_node = dp;
...@@ -146,9 +146,9 @@ void __init fill_ebus_child(struct device_node *dp, ...@@ -146,9 +146,9 @@ void __init fill_ebus_child(struct device_node *dp,
void __init fill_ebus_device(struct device_node *dp, struct linux_ebus_device *dev) void __init fill_ebus_device(struct device_node *dp, struct linux_ebus_device *dev)
{ {
struct linux_prom_registers *regs; const struct linux_prom_registers *regs;
struct linux_ebus_child *child; struct linux_ebus_child *child;
int *irqs; const int *irqs;
int i, n, len; int i, n, len;
unsigned long baseaddr; unsigned long baseaddr;
...@@ -269,7 +269,7 @@ void __init fill_ebus_device(struct device_node *dp, struct linux_ebus_device *d ...@@ -269,7 +269,7 @@ void __init fill_ebus_device(struct device_node *dp, struct linux_ebus_device *d
void __init ebus_init(void) void __init ebus_init(void)
{ {
struct linux_prom_pci_registers *regs; const struct linux_prom_pci_registers *regs;
struct linux_pbm_info *pbm; struct linux_pbm_info *pbm;
struct linux_ebus_device *dev; struct linux_ebus_device *dev;
struct linux_ebus *ebus; struct linux_ebus *ebus;
......
...@@ -210,7 +210,7 @@ struct of_bus { ...@@ -210,7 +210,7 @@ struct of_bus {
int *addrc, int *sizec); int *addrc, int *sizec);
int (*map)(u32 *addr, const u32 *range, int (*map)(u32 *addr, const u32 *range,
int na, int ns, int pna); int na, int ns, int pna);
unsigned int (*get_flags)(u32 *addr); unsigned int (*get_flags)(const u32 *addr);
}; };
/* /*
...@@ -270,7 +270,7 @@ static int of_bus_default_map(u32 *addr, const u32 *range, ...@@ -270,7 +270,7 @@ static int of_bus_default_map(u32 *addr, const u32 *range,
return 0; return 0;
} }
static unsigned int of_bus_default_get_flags(u32 *addr) static unsigned int of_bus_default_get_flags(const u32 *addr)
{ {
return IORESOURCE_MEM; return IORESOURCE_MEM;
} }
...@@ -334,7 +334,7 @@ static int of_bus_pci_map(u32 *addr, const u32 *range, ...@@ -334,7 +334,7 @@ static int of_bus_pci_map(u32 *addr, const u32 *range,
return 0; return 0;
} }
static unsigned int of_bus_pci_get_flags(u32 *addr) static unsigned int of_bus_pci_get_flags(const u32 *addr)
{ {
unsigned int flags = 0; unsigned int flags = 0;
u32 w = addr[0]; 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,7 +375,7 @@ static int of_bus_sbus_map(u32 *addr, const u32 *range, int na, int ns, int pna)
return of_bus_default_map(addr, range, na, ns, pna); return of_bus_default_map(addr, range, na, ns, pna);
} }
static unsigned int of_bus_sbus_get_flags(u32 *addr) static unsigned int of_bus_sbus_get_flags(const u32 *addr)
{ {
return IORESOURCE_MEM; return IORESOURCE_MEM;
} }
...@@ -432,7 +432,7 @@ static int __init build_one_resource(struct device_node *parent, ...@@ -432,7 +432,7 @@ static int __init build_one_resource(struct device_node *parent,
u32 *addr, u32 *addr,
int na, int ns, int pna) int na, int ns, int pna)
{ {
u32 *ranges; const u32 *ranges;
unsigned int rlen; unsigned int rlen;
int rone; int rone;
...@@ -470,7 +470,7 @@ static void __init build_device_resources(struct of_device *op, ...@@ -470,7 +470,7 @@ static void __init build_device_resources(struct of_device *op,
struct of_bus *bus; struct of_bus *bus;
int na, ns; int na, ns;
int index, num_reg; int index, num_reg;
void *preg; const void *preg;
if (!parent) if (!parent)
return; return;
...@@ -492,7 +492,7 @@ static void __init build_device_resources(struct of_device *op, ...@@ -492,7 +492,7 @@ static void __init build_device_resources(struct of_device *op,
for (index = 0; index < num_reg; index++) { for (index = 0; index < num_reg; index++) {
struct resource *r = &op->resource[index]; struct resource *r = &op->resource[index];
u32 addr[OF_MAX_ADDR_CELLS]; u32 addr[OF_MAX_ADDR_CELLS];
u32 *reg = (preg + (index * ((na + ns) * 4))); const u32 *reg = (preg + (index * ((na + ns) * 4)));
struct device_node *dp = op->node; struct device_node *dp = op->node;
struct device_node *pp = p_op->node; struct device_node *pp = p_op->node;
struct of_bus *pbus, *dbus; struct of_bus *pbus, *dbus;
...@@ -559,7 +559,7 @@ static struct of_device * __init scan_one_device(struct device_node *dp, ...@@ -559,7 +559,7 @@ static struct of_device * __init scan_one_device(struct device_node *dp,
struct device *parent) struct device *parent)
{ {
struct of_device *op = kzalloc(sizeof(*op), GFP_KERNEL); struct of_device *op = kzalloc(sizeof(*op), GFP_KERNEL);
struct linux_prom_irqs *intr; const struct linux_prom_irqs *intr;
int len, i; int len, i;
if (!op) if (!op)
...@@ -579,7 +579,8 @@ static struct of_device * __init scan_one_device(struct device_node *dp, ...@@ -579,7 +579,8 @@ static struct of_device * __init scan_one_device(struct device_node *dp,
for (i = 0; i < op->num_irqs; i++) for (i = 0; i < op->num_irqs; i++)
op->irqs[i] = intr[i].pri; op->irqs[i] = intr[i].pri;
} else { } else {
unsigned int *irq = of_get_property(dp, "interrupts", &len); const unsigned int *irq =
of_get_property(dp, "interrupts", &len);
if (irq) { if (irq) {
op->num_irqs = len / sizeof(unsigned int); op->num_irqs = len / sizeof(unsigned int);
...@@ -594,7 +595,7 @@ static struct of_device * __init scan_one_device(struct device_node *dp, ...@@ -594,7 +595,7 @@ static struct of_device * __init scan_one_device(struct device_node *dp,
0, 0, 1, 2, 0, 3, 0, 4, 0, 5, 0, 6, 0, 7, 0, 0, 0, 0, 1, 2, 0, 3, 0, 4, 0, 5, 0, 6, 0, 7, 0, 0,
}; };
struct device_node *io_unit, *sbi = dp->parent; struct device_node *io_unit, *sbi = dp->parent;
struct linux_prom_registers *regs; const struct linux_prom_registers *regs;
int board, slot; int board, slot;
while (sbi) { while (sbi) {
......
...@@ -37,7 +37,7 @@ int of_device_is_compatible(struct device_node *device, const char *compat) ...@@ -37,7 +37,7 @@ int of_device_is_compatible(struct device_node *device, const char *compat)
const char* cp; const char* cp;
int cplen, l; int cplen, l;
cp = (char *) of_get_property(device, "compatible", &cplen); cp = of_get_property(device, "compatible", &cplen);
if (cp == NULL) if (cp == NULL)
return 0; return 0;
while (cplen > 0) { while (cplen > 0) {
...@@ -192,7 +192,7 @@ EXPORT_SYMBOL(of_getintprop_default); ...@@ -192,7 +192,7 @@ EXPORT_SYMBOL(of_getintprop_default);
int of_n_addr_cells(struct device_node *np) int of_n_addr_cells(struct device_node *np)
{ {
int* ip; const int* ip;
do { do {
if (np->parent) if (np->parent)
np = np->parent; np = np->parent;
...@@ -207,7 +207,7 @@ EXPORT_SYMBOL(of_n_addr_cells); ...@@ -207,7 +207,7 @@ EXPORT_SYMBOL(of_n_addr_cells);
int of_n_size_cells(struct device_node *np) int of_n_size_cells(struct device_node *np)
{ {
int* ip; const int* ip;
do { do {
if (np->parent) if (np->parent)
np = np->parent; np = np->parent;
......
...@@ -301,7 +301,7 @@ static __inline__ void sun4_clock_probe(void) ...@@ -301,7 +301,7 @@ static __inline__ void sun4_clock_probe(void)
static int __devinit clock_probe(struct of_device *op, const struct of_device_id *match) static int __devinit clock_probe(struct of_device *op, const struct of_device_id *match)
{ {
struct device_node *dp = op->node; struct device_node *dp = op->node;
char *model = of_get_property(dp, "model", NULL); const char *model = of_get_property(dp, "model", NULL);
if (!model) if (!model)
return -ENODEV; return -ENODEV;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment