xiaomi-sm8450/android_kernel_xiaomi_sm8450
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
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);