Commit 9213feea authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Paul Mackerras
Browse files

[POWERPC] Rename prom_n_size_cells to of_n_size_cells 



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

Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent a8bda5dd

arch/powerpc/kernel/prom.c

+2 −3
Original line number Diff line number Diff line
@@ -1056,8 +1056,7 @@ int of_n_addr_cells(struct device_node* np) 
}

EXPORT_SYMBOL(of_n_addr_cells);



int

prom_n_size_cells(struct device_node* np)

int of_n_size_cells(struct device_node* np)

{

	const int* ip;

	do {
@@ -1070,7 +1069,7 @@ prom_n_size_cells(struct device_node* np) 
	/* No #size-cells property for the root node, default to 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.

arch/powerpc/kernel/prom_parse.c

+2 −2
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ static void of_bus_default_count_cells(struct device_node *dev, 
	if (addrc)

		*addrc = of_n_addr_cells(dev);

	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,
@@ -660,7 +660,7 @@ void of_parse_dma_window(struct device_node *dn, const void *dma_window_prop, 
	dma_window += cells;



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

}

arch/powerpc/kernel/setup-common.c

+1 −1
Original line number Diff line number Diff line
@@ -380,7 +380,7 @@ void __init smp_setup_cpu_maps(void) 
		const unsigned int *ireg;



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

arch/powerpc/mm/numa.c

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



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

}

drivers/char/tpm/tpm_atmel.h

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ static void __iomem * atmel_get_base_addr(unsigned long *base, int *region_size) 


	reg = get_property(dn, "reg", &reglen);

	naddrc = of_n_addr_cells(dn);

	nsizec = prom_n_size_cells(dn);

	nsizec = of_n_size_cells(dn);



	of_node_put(dn);