lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[POWERPC] Rename prom_n_size_cells to of_n_size_cells

Browse Source 
This is more consistent and gets us closer to the Sparc code.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Stephen Rothwell
2007-04-03 10:57:48 +10:00
committed by Paul Mackerras
parent a8bda5dd4f
commit 9213feea6e
6 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
arch/powerpc/kernel/prom.c
View File

@@ -1056,8 +1056,7 @@ int of_n_addr_cells(struct device_node* np)
} }
EXPORT_SYMBOL(of_n_addr_cells); EXPORT_SYMBOL(of_n_addr_cells);
int int of_n_size_cells(struct device_node* np)
prom_n_size_cells(struct device_node* np)
{ {
const int* ip; const int* ip;
do { do {
@@ -1070,7 +1069,7 @@ prom_n_size_cells(struct device_node* np)
/* No #size-cells property for the root node, default to 1 */ /* No #size-cells property for the root node, default to 1 */
return 1; return 1;
} }
EXPORT_SYMBOL(prom_n_size_cells); EXPORT_SYMBOL(of_n_size_cells);
/** /**
* Construct and return a list of the device_nodes with a given name. * Construct and return a list of the device_nodes with a given name.

4
arch/powerpc/kernel/prom_parse.c
View File

@@ -70,7 +70,7 @@ static void of_bus_default_count_cells(struct device_node *dev,
if (addrc) if (addrc)
*addrc = of_n_addr_cells(dev); *addrc = of_n_addr_cells(dev);
if (sizec) if (sizec)
*sizec = prom_n_size_cells(dev); *sizec = of_n_size_cells(dev);
} }
static u64 of_bus_default_map(u32 *addr, const u32 *range, static u64 of_bus_default_map(u32 *addr, const u32 *range,
@@ -660,7 +660,7 @@ void of_parse_dma_window(struct device_node *dn, const void *dma_window_prop,
dma_window += cells; dma_window += cells;
prop = get_property(dn, "ibm,#dma-size-cells", NULL); prop = get_property(dn, "ibm,#dma-size-cells", NULL);
cells = prop ? *(u32 *)prop : prom_n_size_cells(dn); cells = prop ? *(u32 *)prop : of_n_size_cells(dn);
*size = of_read_number(dma_window, cells); *size = of_read_number(dma_window, cells);
} }

2
arch/powerpc/kernel/setup-common.c
View File

@@ -380,7 +380,7 @@ void __init smp_setup_cpu_maps(void)
const unsigned int *ireg; const unsigned int *ireg;
num_addr_cell = of_n_addr_cells(dn); num_addr_cell = of_n_addr_cells(dn);
num_size_cell = prom_n_size_cells(dn); num_size_cell = of_n_size_cells(dn);
ireg = get_property(dn, "ibm,lrdr-capacity", NULL); ireg = get_property(dn, "ibm,lrdr-capacity", NULL);

2
arch/powerpc/mm/numa.c
View File

@@ -202,7 +202,7 @@ static void __init get_n_mem_cells(int *n_addr_cells, int *n_size_cells)
panic("numa.c: No memory nodes found!"); panic("numa.c: No memory nodes found!");
*n_addr_cells = of_n_addr_cells(memory); *n_addr_cells = of_n_addr_cells(memory);
*n_size_cells = prom_n_size_cells(memory); *n_size_cells = of_n_size_cells(memory);
of_node_put(memory); of_node_put(memory);
} }

2
drivers/char/tpm/tpm_atmel.h
View File

@@ -54,7 +54,7 @@ static void __iomem * atmel_get_base_addr(unsigned long *base, int *region_size)
reg = get_property(dn, "reg", &reglen); reg = get_property(dn, "reg", &reglen);
naddrc = of_n_addr_cells(dn); naddrc = of_n_addr_cells(dn);
nsizec = prom_n_size_cells(dn); nsizec = of_n_size_cells(dn);
of_node_put(dn); of_node_put(dn);

2
include/asm-powerpc/prom.h
View File

@@ -172,7 +172,7 @@ extern const void *of_get_property(const struct device_node *node,
#define get_property(a, b, c) of_get_property((a), (b), (c)) #define get_property(a, b, c) of_get_property((a), (b), (c))
extern void print_properties(struct device_node *node); extern void print_properties(struct device_node *node);
extern int of_n_addr_cells(struct device_node* np); extern int of_n_addr_cells(struct device_node* np);
extern int prom_n_size_cells(struct device_node* np); extern int of_n_size_cells(struct device_node* np);
extern int prom_n_intr_cells(struct device_node* np); extern int prom_n_intr_cells(struct device_node* np);
extern void prom_get_irq_senses(unsigned char *senses, int off, int max); extern void prom_get_irq_senses(unsigned char *senses, int off, int max);
extern int prom_add_property(struct device_node* np, struct property* prop); extern int prom_add_property(struct device_node* np, struct property* prop);