diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2007-04-02 20:56:50 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-04-12 13:55:18 -0400 |
commit | a8bda5dd4f99d6469f3c0dc362db3cce8a4d6416 (patch) | |
tree | 513cb0896e142b5eca6fd445cde11b651f408824 /arch/powerpc/platforms/pseries | |
parent | 7a92f74f98bde8498c98aad6cac5da5a87dd0bf4 (diff) |
[POWERPC] Rename prom_n_addr_cells to of_n_addr_cells
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>
Diffstat (limited to 'arch/powerpc/platforms/pseries')
-rw-r--r-- | arch/powerpc/platforms/pseries/setup.c | 4 | ||||
-rw-r--r-- | arch/powerpc/platforms/pseries/xics.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c index ff87b1ad8ce9..54e93eb8a8ee 100644 --- a/arch/powerpc/platforms/pseries/setup.c +++ b/arch/powerpc/platforms/pseries/setup.c | |||
@@ -139,7 +139,7 @@ static void __init pseries_mpic_init_IRQ(void) | |||
139 | struct mpic *mpic; | 139 | struct mpic *mpic; |
140 | 140 | ||
141 | np = of_find_node_by_path("/"); | 141 | np = of_find_node_by_path("/"); |
142 | naddr = prom_n_addr_cells(np); | 142 | naddr = of_n_addr_cells(np); |
143 | opprop = get_property(np, "platform-open-pic", &opplen); | 143 | opprop = get_property(np, "platform-open-pic", &opplen); |
144 | if (opprop != 0) { | 144 | if (opprop != 0) { |
145 | openpic_addr = of_read_number(opprop, naddr); | 145 | openpic_addr = of_read_number(opprop, naddr); |
@@ -193,7 +193,7 @@ static void __init pseries_mpic_init_IRQ(void) | |||
193 | NULL); | 193 | NULL); |
194 | if (addrp == NULL) | 194 | if (addrp == NULL) |
195 | continue; | 195 | continue; |
196 | naddr = prom_n_addr_cells(np); | 196 | naddr = of_n_addr_cells(np); |
197 | intack = addrp[naddr-1]; | 197 | intack = addrp[naddr-1]; |
198 | if (naddr > 1) | 198 | if (naddr > 1) |
199 | intack |= ((unsigned long)addrp[naddr-2]) << 32; | 199 | intack |= ((unsigned long)addrp[naddr-2]) << 32; |
diff --git a/arch/powerpc/platforms/pseries/xics.c b/arch/powerpc/platforms/pseries/xics.c index 81d172d65038..f0795faada91 100644 --- a/arch/powerpc/platforms/pseries/xics.c +++ b/arch/powerpc/platforms/pseries/xics.c | |||
@@ -643,7 +643,7 @@ static void __init xics_setup_8259_cascade(void) | |||
643 | addrp = get_property(np, "8259-interrupt-acknowledge", NULL); | 643 | addrp = get_property(np, "8259-interrupt-acknowledge", NULL); |
644 | if (addrp == NULL) | 644 | if (addrp == NULL) |
645 | continue; | 645 | continue; |
646 | naddr = prom_n_addr_cells(np); | 646 | naddr = of_n_addr_cells(np); |
647 | intack = addrp[naddr-1]; | 647 | intack = addrp[naddr-1]; |
648 | if (naddr > 1) | 648 | if (naddr > 1) |
649 | intack |= ((unsigned long)addrp[naddr-2]) << 32; | 649 | intack |= ((unsigned long)addrp[naddr-2]) << 32; |