diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2007-05-03 03:26:52 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-05-07 06:31:14 -0400 |
commit | 55b61fec22caa3e7872caea6c4100fc75cb8f49b (patch) | |
tree | 995c2cf733bbd9ee1adc6e77773b0e31e9c21267 /arch/powerpc/platforms/pseries | |
parent | d9333afd6a714760c13f76ba275a32ec7bd979c1 (diff) |
[POWERPC] Rename device_is_compatible to of_device_is_compatible
for consistency with other Open Firmware interfaces (and Sparc).
This is just a straight replacement.
This leaves the compatibility define in place.
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/lpar.c | 4 | ||||
-rw-r--r-- | arch/powerpc/platforms/pseries/setup.c | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/pseries/xics.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/arch/powerpc/platforms/pseries/lpar.c b/arch/powerpc/platforms/pseries/lpar.c index 3a70e8ad7bc8..362dfbc260a6 100644 --- a/arch/powerpc/platforms/pseries/lpar.c +++ b/arch/powerpc/platforms/pseries/lpar.c | |||
@@ -231,13 +231,13 @@ void __init find_udbg_vterm(void) | |||
231 | goto out; | 231 | goto out; |
232 | vtermno = termno[0]; | 232 | vtermno = termno[0]; |
233 | 233 | ||
234 | if (device_is_compatible(stdout_node, "hvterm1")) { | 234 | if (of_device_is_compatible(stdout_node, "hvterm1")) { |
235 | udbg_putc = udbg_putcLP; | 235 | udbg_putc = udbg_putcLP; |
236 | udbg_getc = udbg_getcLP; | 236 | udbg_getc = udbg_getcLP; |
237 | udbg_getc_poll = udbg_getc_pollLP; | 237 | udbg_getc_poll = udbg_getc_pollLP; |
238 | if (add_console) | 238 | if (add_console) |
239 | add_preferred_console("hvc", termno[0] & 0xff, NULL); | 239 | add_preferred_console("hvc", termno[0] & 0xff, NULL); |
240 | } else if (device_is_compatible(stdout_node, "hvterm-protocol")) { | 240 | } else if (of_device_is_compatible(stdout_node, "hvterm-protocol")) { |
241 | vtermno = termno[0]; | 241 | vtermno = termno[0]; |
242 | udbg_putc = udbg_hvsi_putc; | 242 | udbg_putc = udbg_hvsi_putc; |
243 | udbg_getc = udbg_hvsi_getc; | 243 | udbg_getc = udbg_hvsi_getc; |
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c index 33eec2822c66..470db6efaeb6 100644 --- a/arch/powerpc/platforms/pseries/setup.c +++ b/arch/powerpc/platforms/pseries/setup.c | |||
@@ -168,7 +168,7 @@ static void __init pseries_mpic_init_IRQ(void) | |||
168 | 168 | ||
169 | /* Look for cascade */ | 169 | /* Look for cascade */ |
170 | for_each_node_by_type(np, "interrupt-controller") | 170 | for_each_node_by_type(np, "interrupt-controller") |
171 | if (device_is_compatible(np, "chrp,iic")) { | 171 | if (of_device_is_compatible(np, "chrp,iic")) { |
172 | cascade = np; | 172 | cascade = np; |
173 | break; | 173 | break; |
174 | } | 174 | } |
diff --git a/arch/powerpc/platforms/pseries/xics.c b/arch/powerpc/platforms/pseries/xics.c index 896cbf340c42..b854e7f1001c 100644 --- a/arch/powerpc/platforms/pseries/xics.c +++ b/arch/powerpc/platforms/pseries/xics.c | |||
@@ -477,7 +477,7 @@ static int xics_host_match(struct irq_host *h, struct device_node *node) | |||
477 | * like vdevices, events, etc... The trick we use here is to match | 477 | * like vdevices, events, etc... The trick we use here is to match |
478 | * everything here except the legacy 8259 which is compatible "chrp,iic" | 478 | * everything here except the legacy 8259 which is compatible "chrp,iic" |
479 | */ | 479 | */ |
480 | return !device_is_compatible(node, "chrp,iic"); | 480 | return !of_device_is_compatible(node, "chrp,iic"); |
481 | } | 481 | } |
482 | 482 | ||
483 | static int xics_host_map_direct(struct irq_host *h, unsigned int virq, | 483 | static int xics_host_map_direct(struct irq_host *h, unsigned int virq, |
@@ -618,7 +618,7 @@ static void __init xics_setup_8259_cascade(void) | |||
618 | unsigned long intack = 0; | 618 | unsigned long intack = 0; |
619 | 619 | ||
620 | for_each_node_by_type(np, "interrupt-controller") | 620 | for_each_node_by_type(np, "interrupt-controller") |
621 | if (device_is_compatible(np, "chrp,iic")) { | 621 | if (of_device_is_compatible(np, "chrp,iic")) { |
622 | found = np; | 622 | found = np; |
623 | break; | 623 | break; |
624 | } | 624 | } |