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

[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

arch/sparc/kernel/ebus.c

+5 −5
Original line number Diff line number Diff line
@@ -86,8 +86,8 @@ int __init ebus_blacklist_irq(char *name) 
void __init fill_ebus_child(struct device_node *dp,

			    struct linux_ebus_child *dev)

{

	int *regs;

	int *irqs;

	const int *regs;

	const int *irqs;

	int i, len;



	dev->prom_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)

{

	struct linux_prom_registers *regs;

	const struct linux_prom_registers *regs;

	struct linux_ebus_child *child;

	int *irqs;

	const int *irqs;

	int i, n, len;

	unsigned long baseaddr;
@@ -269,7 +269,7 @@ void __init fill_ebus_device(struct device_node *dp, struct linux_ebus_device *d 


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_ebus_device *dev;

	struct linux_ebus *ebus;

arch/sparc/kernel/of_device.c

+11 −10
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ struct of_bus { 
				       int *addrc, int *sizec);

	int		(*map)(u32 *addr, const u32 *range,

			       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, 
	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;

}
@@ -334,7 +334,7 @@ static int of_bus_pci_map(u32 *addr, const u32 *range, 
	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;

	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) 
	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;

}
@@ -432,7 +432,7 @@ static int __init build_one_resource(struct device_node *parent, 
				     u32 *addr,

				     int na, int ns, int pna)

{

	u32 *ranges;

	const u32 *ranges;

	unsigned int rlen;

	int rone;
@@ -470,7 +470,7 @@ static void __init build_device_resources(struct of_device *op, 
	struct of_bus *bus;

	int na, ns;

	int index, num_reg;

	void *preg;

	const void *preg;



	if (!parent)

		return;
@@ -492,7 +492,7 @@ static void __init build_device_resources(struct of_device *op, 
	for (index = 0; index < num_reg; index++) {

		struct resource *r = &op->resource[index];

		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 *pp = p_op->node;

		struct of_bus *pbus, *dbus;
@@ -559,7 +559,7 @@ static struct of_device * __init scan_one_device(struct device_node *dp, 
						 struct device *parent)

{

	struct of_device *op = kzalloc(sizeof(*op), GFP_KERNEL);

	struct linux_prom_irqs *intr;

	const struct linux_prom_irqs *intr;

	int len, i;



	if (!op)
@@ -579,7 +579,8 @@ static struct of_device * __init scan_one_device(struct device_node *dp, 
		for (i = 0; i < op->num_irqs; i++)

			op->irqs[i] = intr[i].pri;

	} else {

		unsigned int *irq = of_get_property(dp, "interrupts", &len);

		const unsigned int *irq =

			of_get_property(dp, "interrupts", &len);



		if (irq) {

			op->num_irqs = len / sizeof(unsigned int);
@@ -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,

		};

		struct device_node *io_unit, *sbi = dp->parent;

		struct linux_prom_registers *regs;

		const struct linux_prom_registers *regs;

		int board, slot;



		while (sbi) {

arch/sparc/kernel/prom.c

+3 −3
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ int of_device_is_compatible(struct device_node *device, const char *compat) 
	const char* cp;

	int cplen, l;



	cp = (char *) of_get_property(device, "compatible", &cplen);

	cp = of_get_property(device, "compatible", &cplen);

	if (cp == NULL)

		return 0;

	while (cplen > 0) {
@@ -192,7 +192,7 @@ EXPORT_SYMBOL(of_getintprop_default); 


int of_n_addr_cells(struct device_node *np)

{

	int* ip;

	const int* ip;

	do {

		if (np->parent)

			np = np->parent;
@@ -207,7 +207,7 @@ EXPORT_SYMBOL(of_n_addr_cells); 


int of_n_size_cells(struct device_node *np)

{

	int* ip;

	const int* ip;

	do {

		if (np->parent)

			np = np->parent;

arch/sparc/kernel/time.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

{

	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)

		return -ENODEV;