Merge master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6

[linux-drm-fsl-dcu.git] / arch / powerpc / platforms / pseries / xics.c

diff --git a/arch/powerpc/platforms/pseries/xics.c b/arch/powerpc/platforms/pseries/xics.c
index b5b2b1103de8d58dd2f49b6b766fe4d429913c46..b854e7f1001c60c79697cd96c957b388a0fe7b98 100644 (file)
--- a/arch/powerpc/platforms/pseries/xics.c
+++ b/arch/powerpc/platforms/pseries/xics.c
@@ -224,7 +224,6 @@ static void xics_unmask_irq(unsigned int virq)
 static void xics_mask_real_irq(unsigned int irq)
 {
        int call_status;
-       unsigned int server;
 
        if (irq == XICS_IPI)
                return;
@@ -236,9 +235,9 @@ static void xics_mask_real_irq(unsigned int irq)
                return;
        }
 
-       server = get_irq_server(irq);
        /* Have to set XIVE to 0xff to be able to remove a slot */
-       call_status = rtas_call(ibm_set_xive, 3, 1, NULL, irq, server, 0xff);
+       call_status = rtas_call(ibm_set_xive, 3, 1, NULL, irq,
+                               default_server, 0xff);
        if (call_status != 0) {
                printk(KERN_ERR "xics_disable_irq: irq=%u: ibm_set_xive(0xff)"
                       " returned %d\n", irq, call_status);
@@ -478,7 +477,7 @@ static int xics_host_match(struct irq_host *h, struct device_node *node)
         * like vdevices, events, etc... The trick we use here is to match
         * everything here except the legacy 8259 which is compatible "chrp,iic"
         */
-       return !device_is_compatible(node, "chrp,iic");
+       return !of_device_is_compatible(node, "chrp,iic");
 }
 
 static int xics_host_map_direct(struct irq_host *h, unsigned int virq,
@@ -577,7 +576,7 @@ static void __init xics_init_one_node(struct device_node *np,
         * This happens to be the case so far but we are playing with fire...
         * should be fixed one of these days. -BenH.
         */
-       ireg = get_property(np, "ibm,interrupt-server-ranges", NULL);
+       ireg = of_get_property(np, "ibm,interrupt-server-ranges", NULL);
 
        /* Do that ever happen ? we'll know soon enough... but even good'old
         * f80 does have that property ..
@@ -589,7 +588,7 @@ static void __init xics_init_one_node(struct device_node *np,
                 */
                *indx = *ireg;
        }
-       ireg = get_property(np, "reg", &ilen);
+       ireg = of_get_property(np, "reg", &ilen);
        if (!ireg)
                panic("xics_init_IRQ: can't find interrupt reg property");
 
@@ -619,7 +618,7 @@ static void __init xics_setup_8259_cascade(void)
        unsigned long intack = 0;
 
        for_each_node_by_type(np, "interrupt-controller")
-               if (device_is_compatible(np, "chrp,iic")) {
+               if (of_device_is_compatible(np, "chrp,iic")) {
                        found = np;
                        break;
                }
@@ -641,10 +640,10 @@ static void __init xics_setup_8259_cascade(void)
                        break;
                if (strcmp(np->name, "pci") != 0)
                        continue;
-               addrp = get_property(np, "8259-interrupt-acknowledge", NULL);
+               addrp = of_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;
@@ -665,10 +664,11 @@ static struct device_node *cpuid_to_of_node(int cpu)
                int i, len;
                const u32 *intserv;
 
-               intserv = get_property(np, "ibm,ppc-interrupt-server#s", &len);
+               intserv = of_get_property(np, "ibm,ppc-interrupt-server#s",
+                                       &len);
 
                if (!intserv)
-                       intserv = get_property(np, "reg", &len);
+                       intserv = of_get_property(np, "reg", &len);
 
                i = len / sizeof(u32);
 
@@ -710,7 +710,7 @@ void __init xics_init_IRQ(void)
        /* Find the server numbers for the boot cpu. */
        np = cpuid_to_of_node(boot_cpuid);
        BUG_ON(!np);
-       ireg = get_property(np, "ibm,ppc-interrupt-gserver#s", &ilen);
+       ireg = of_get_property(np, "ibm,ppc-interrupt-gserver#s", &ilen);
        if (!ireg)
                goto skip_gserver_check;
        i = ilen / sizeof(int);
@@ -726,7 +726,7 @@ void __init xics_init_IRQ(void)
                        default_server = hcpuid;
                        default_distrib_server = ireg[j+1];
 
-                       isize = get_property(np,
+                       isize = of_get_property(np,
                                        "ibm,interrupt-server#-size", NULL);
                        if (isize)
                                interrupt_server_size = *isize;