iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[POWERPC] Rename prom_n_addr_cells to of_n_addr_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:56:50 +10:00 committed by Paul Mackerras
parent 7a92f74f98
commit a8bda5dd4f
13 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/powerpc/kernel/pci_32.c
View File

@ -895,7 +895,7 @@ pci_process_bridge_OF_ranges(struct pci_controller *hose,
int rlen = 0, orig_rlen;
int memno = 0;
struct resource *res;
int np, na = prom_n_addr_cells(dev);
int np, na = of_n_addr_cells(dev);
np = na + 5;
/* First we try to merge ranges to fix a problem with some pmacs

2
arch/powerpc/kernel/pci_64.c
View File

@ -957,7 +957,7 @@ void __devinit pci_process_bridge_OF_ranges(struct pci_controller *hose,
int rlen = 0;
int memno = 0;
struct resource *res;
int np, na = prom_n_addr_cells(dev);
int np, na = of_n_addr_cells(dev);
unsigned long pci_addr, cpu_phys_addr;
np = na + 5;

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

@ -1041,8 +1041,7 @@ void __init early_init_devtree(void *params)
#undef printk
int
prom_n_addr_cells(struct device_node* np)
int of_n_addr_cells(struct device_node* np)
{
const int *ip;
do {
@ -1055,7 +1054,7 @@ prom_n_addr_cells(struct device_node* np)
/* No #address-cells property for the root node, default to 1 */
return 1;
}
EXPORT_SYMBOL(prom_n_addr_cells);
EXPORT_SYMBOL(of_n_addr_cells);
int
prom_n_size_cells(struct device_node* np)

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

@ -68,7 +68,7 @@ static void of_bus_default_count_cells(struct device_node *dev,
int *addrc, int *sizec)
{
if (addrc)
*addrc = prom_n_addr_cells(dev);
*addrc = of_n_addr_cells(dev);
if (sizec)
*sizec = prom_n_size_cells(dev);
}
@ -654,7 +654,7 @@ void of_parse_dma_window(struct device_node *dn, const void *dma_window_prop,
if (!prop)
prop = get_property(dn, "#address-cells", NULL);
cells = prop ? *(u32 *)prop : prom_n_addr_cells(dn);
cells = prop ? *(u32 *)prop : of_n_addr_cells(dn);
*phys = of_read_number(dma_window, cells);
dma_window += cells;

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

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

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

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

4
arch/powerpc/platforms/chrp/setup.c
View File

@ -361,7 +361,7 @@ static void __init chrp_find_openpic(void)
root = of_find_node_by_path("/");
if (root) {
opprop = get_property(root, "platform-open-pic", &oplen);
na = prom_n_addr_cells(root);
na = of_n_addr_cells(root);
}
if (opprop && oplen >= na * sizeof(unsigned int)) {
opaddr = opprop[na-1]; /* assume 32-bit */
@ -468,7 +468,7 @@ static void __init chrp_find_8259(void)
if (addrp == NULL)
continue;
chrp_int_ack = addrp[prom_n_addr_cells(np)-1];
chrp_int_ack = addrp[of_n_addr_cells(np)-1];
break;
}
if (np == NULL)

2
arch/powerpc/platforms/maple/setup.c
View File

@ -248,7 +248,7 @@ static void __init maple_init_IRQ(void)
/* Find address list in /platform-open-pic */
root = of_find_node_by_path("/");
naddr = prom_n_addr_cells(root);
naddr = of_n_addr_cells(root);
opprop = get_property(root, "platform-open-pic", &opplen);
if (opprop != 0) {
openpic_addr = of_read_number(opprop, naddr);

2
arch/powerpc/platforms/pasemi/setup.c
View File

@ -136,7 +136,7 @@ static __init void pas_init_IRQ(void)
/* Find address list in /platform-open-pic */
root = of_find_node_by_path("/");
naddr = prom_n_addr_cells(root);
naddr = of_n_addr_cells(root);
opprop = get_property(root, "platform-open-pic", &opplen);
if (!opprop) {
printk(KERN_ERR "No platform-open-pic property.\n");

4
arch/powerpc/platforms/pseries/setup.c
View File

@ -139,7 +139,7 @@ static void __init pseries_mpic_init_IRQ(void)
struct mpic *mpic;
np = of_find_node_by_path("/");
naddr = prom_n_addr_cells(np);
naddr = of_n_addr_cells(np);
opprop = get_property(np, "platform-open-pic", &opplen);
if (opprop != 0) {
openpic_addr = of_read_number(opprop, naddr);
@ -193,7 +193,7 @@ static void __init pseries_mpic_init_IRQ(void)
NULL);
if (addrp == NULL)
continue;
naddr = prom_n_addr_cells(np);
naddr = of_n_addr_cells(np);
intack = addrp[naddr-1];
if (naddr > 1)
intack |= ((unsigned long)addrp[naddr-2]) << 32;

2
arch/powerpc/platforms/pseries/xics.c
View File

@ -643,7 +643,7 @@ static void __init xics_setup_8259_cascade(void)
addrp = get_property(np, "8259-interrupt-acknowledge", NULL);
if (addrp == NULL)
continue;
naddr = prom_n_addr_cells(np);
naddr = of_n_addr_cells(np);
intack = addrp[naddr-1];
if (naddr > 1)
intack |= ((unsigned long)addrp[naddr-2]) << 32;

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

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

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

@ -171,7 +171,7 @@ extern const void *of_get_property(const struct device_node *node,
int *lenp);
#define get_property(a, b, c) of_get_property((a), (b), (c))
extern void print_properties(struct device_node *node);
extern int prom_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 prom_n_intr_cells(struct device_node* np);
extern void prom_get_irq_senses(unsigned char *senses, int off, int max);