[POWERPC] PS3: Interrupt routine fixups.

Fixups for the ps3 interrupt routines to support all HV device
in a generic way.

Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>

1 files changed, 8 insertions, 8 deletions

diff --git a/arch/powerpc/platforms/ps3/spu.c b/arch/powerpc/platforms/ps3/spu.c
index af8efe3c459..651437cb2c1 100644
--- a/arch/powerpc/platforms/ps3/spu.c
+++ b/arch/powerpc/platforms/ps3/spu.c
@@ -230,19 +230,19 @@ static int __init setup_interrupts(struct spu *spu)
 {
         int result;
 
-        result = ps3_alloc_spe_irq(PS3_BINDING_CPU_ANY, spu_pdata(spu)->spe_id,
+        result = ps3_spe_irq_setup(PS3_BINDING_CPU_ANY, spu_pdata(spu)->spe_id,
                 0, &spu->irqs[0]);
 
         if (result)
                 goto fail_alloc_0;
 
-        result = ps3_alloc_spe_irq(PS3_BINDING_CPU_ANY, spu_pdata(spu)->spe_id,
+        result = ps3_spe_irq_setup(PS3_BINDING_CPU_ANY, spu_pdata(spu)->spe_id,
                 1, &spu->irqs[1]);
 
         if (result)
                 goto fail_alloc_1;
 
-        result = ps3_alloc_spe_irq(PS3_BINDING_CPU_ANY, spu_pdata(spu)->spe_id,
+        result = ps3_spe_irq_setup(PS3_BINDING_CPU_ANY, spu_pdata(spu)->spe_id,
                 2, &spu->irqs[2]);
 
         if (result)
@@ -251,9 +251,9 @@ static int __init setup_interrupts(struct spu *spu)
         return result;
 
 fail_alloc_2:
-        ps3_free_spe_irq(spu->irqs[1]);
+        ps3_spe_irq_destroy(spu->irqs[1]);
 fail_alloc_1:
-        ps3_free_spe_irq(spu->irqs[0]);
+        ps3_spe_irq_destroy(spu->irqs[0]);
 fail_alloc_0:
         spu->irqs[0] = spu->irqs[1] = spu->irqs[2] = NO_IRQ;
         return result;
@@ -301,9 +301,9 @@ static int ps3_destroy_spu(struct spu *spu)
         result = lv1_disable_logical_spe(spu_pdata(spu)->spe_id, 0);
         BUG_ON(result);
 
-        ps3_free_spe_irq(spu->irqs[2]);
-        ps3_free_spe_irq(spu->irqs[1]);
-        ps3_free_spe_irq(spu->irqs[0]);
+        ps3_spe_irq_destroy(spu->irqs[2]);
+        ps3_spe_irq_destroy(spu->irqs[1]);
+        ps3_spe_irq_destroy(spu->irqs[0]);
 
         spu->irqs[0] = spu->irqs[1] = spu->irqs[2] = NO_IRQ;