Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b5a1a9ab authored by Jeremy Kerr's avatar Jeremy Kerr Committed by Paul Mackerras
Browse files

[POWERPC] Use const qualifiers for prom parsing utilites



The of_bus callbacks map and get_flags can be constified, as they don't
alter the range or addr arguments. of_dump_addr and of_read_addr can
also be constified.

Built for 32- and 64-bit powerpc

Signed-off-by: default avatarJeremy Kerr <jk@ozlabs.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 980ffd32
Loading
Loading
Loading
Loading
+12 −10
Original line number Original line Diff line number Diff line
@@ -27,7 +27,7 @@


/* Debug utility */
/* Debug utility */
#ifdef DEBUG
#ifdef DEBUG
static void of_dump_addr(const char *s, u32 *addr, int na)
static void of_dump_addr(const char *s, const u32 *addr, int na)
{
{
	printk("%s", s);
	printk("%s", s);
	while(na--)
	while(na--)
@@ -35,7 +35,7 @@ static void of_dump_addr(const char *s, u32 *addr, int na)
	printk("\n");
	printk("\n");
}
}
#else
#else
static void of_dump_addr(const char *s, u32 *addr, int na) { }
static void of_dump_addr(const char *s, const u32 *addr, int na) { }
#endif
#endif




@@ -46,9 +46,10 @@ struct of_bus {
	int		(*match)(struct device_node *parent);
	int		(*match)(struct device_node *parent);
	void		(*count_cells)(struct device_node *child,
	void		(*count_cells)(struct device_node *child,
				       int *addrc, int *sizec);
				       int *addrc, int *sizec);
	u64		(*map)(u32 *addr, u32 *range, int na, int ns, int pna);
	u64		(*map)(u32 *addr, const u32 *range,
				int na, int ns, int pna);
	int		(*translate)(u32 *addr, u64 offset, int na);
	int		(*translate)(u32 *addr, u64 offset, int na);
	unsigned int	(*get_flags)(u32 *addr);
	unsigned int	(*get_flags)(const u32 *addr);
};
};




@@ -65,7 +66,8 @@ static void of_bus_default_count_cells(struct device_node *dev,
		*sizec = prom_n_size_cells(dev);
		*sizec = prom_n_size_cells(dev);
}
}


static u64 of_bus_default_map(u32 *addr, u32 *range, int na, int ns, int pna)
static u64 of_bus_default_map(u32 *addr, const u32 *range,
		int na, int ns, int pna)
{
{
	u64 cp, s, da;
	u64 cp, s, da;


@@ -93,7 +95,7 @@ static int of_bus_default_translate(u32 *addr, u64 offset, int na)
	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;
}
}
@@ -118,7 +120,7 @@ static void of_bus_pci_count_cells(struct device_node *np,
		*sizec = 2;
		*sizec = 2;
}
}


static u64 of_bus_pci_map(u32 *addr, u32 *range, int na, int ns, int pna)
static u64 of_bus_pci_map(u32 *addr, const u32 *range, int na, int ns, int pna)
{
{
	u64 cp, s, da;
	u64 cp, s, da;


@@ -143,7 +145,7 @@ static int of_bus_pci_translate(u32 *addr, u64 offset, int na)
	return of_bus_default_translate(addr + 1, offset, na - 1);
	return of_bus_default_translate(addr + 1, offset, na - 1);
}
}


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];
@@ -178,7 +180,7 @@ static void of_bus_isa_count_cells(struct device_node *child,
		*sizec = 1;
		*sizec = 1;
}
}


static u64 of_bus_isa_map(u32 *addr, u32 *range, int na, int ns, int pna)
static u64 of_bus_isa_map(u32 *addr, const u32 *range, int na, int ns, int pna)
{
{
	u64 cp, s, da;
	u64 cp, s, da;


@@ -203,7 +205,7 @@ static int of_bus_isa_translate(u32 *addr, u64 offset, int na)
	return of_bus_default_translate(addr + 1, offset, na - 1);
	return of_bus_default_translate(addr + 1, offset, na - 1);
}
}


static unsigned int of_bus_isa_get_flags(u32 *addr)
static unsigned int of_bus_isa_get_flags(const u32 *addr)
{
{
	unsigned int flags = 0;
	unsigned int flags = 0;
	u32 w = addr[0];
	u32 w = addr[0];
+1 −1
Original line number Original line Diff line number Diff line
@@ -198,7 +198,7 @@ extern int release_OF_resource(struct device_node* node, int index);




/* Helper to read a big number */
/* Helper to read a big number */
static inline u64 of_read_number(u32 *cell, int size)
static inline u64 of_read_number(const u32 *cell, int size)
{
{
	u64 r = 0;
	u64 r = 0;
	while (size--)
	while (size--)