[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>

4 files changed, 14 insertions, 14 deletions

diff --git a/drivers/ps3/vuart.c b/drivers/ps3/vuart.c
index 7d7cab1d91b4..ec2d36a1bc67 100644
--- a/drivers/ps3/vuart.c
+++ b/drivers/ps3/vuart.c
@@ -886,12 +886,12 @@ static int ps3_vuart_probe(struct device *_dev)
 
         if (++vuart_bus_priv.use_count == 1) {
 
-                result = ps3_alloc_vuart_irq(PS3_BINDING_CPU_ANY,
+                result = ps3_vuart_irq_setup(PS3_BINDING_CPU_ANY,
                         (void*)&vuart_bus_priv.bmp.status, &vuart_bus_priv.virq);
 
                 if (result) {
                         dev_dbg(&dev->core,
-                                "%s:%d: ps3_alloc_vuart_irq failed (%d)\n",
+                                "%s:%d: ps3_vuart_irq_setup failed (%d)\n",
                                 __func__, __LINE__, result);
                         result = -EPERM;
                         goto fail_alloc_irq;
@@ -937,7 +937,7 @@ static int ps3_vuart_probe(struct device *_dev)
 fail_probe:
         ps3_vuart_set_interrupt_mask(dev, 0);
 fail_request_irq:
-        ps3_free_vuart_irq(vuart_bus_priv.virq);
+        ps3_vuart_irq_destroy(vuart_bus_priv.virq);
         vuart_bus_priv.virq = NO_IRQ;
 fail_alloc_irq:
         --vuart_bus_priv.use_count;
@@ -975,7 +975,7 @@ static int ps3_vuart_remove(struct device *_dev)
         if (--vuart_bus_priv.use_count == 0) {
                 BUG();
                 free_irq(vuart_bus_priv.virq, &vuart_bus_priv);
-                ps3_free_vuart_irq(vuart_bus_priv.virq);
+                ps3_vuart_irq_destroy(vuart_bus_priv.virq);
                 vuart_bus_priv.virq = NO_IRQ;
         }
 
diff --git a/drivers/usb/host/ehci-ps3.c b/drivers/usb/host/ehci-ps3.c
index 4d781a2a9807..29dcd27b55de 100644
--- a/drivers/usb/host/ehci-ps3.c
+++ b/drivers/usb/host/ehci-ps3.c
@@ -104,7 +104,7 @@ static int ps3_ehci_sb_probe(struct ps3_system_bus_device *dev)
         dev_dbg(&dev->core, "%s:%d: mmio mapped_addr %lxh\n", __func__,
                 __LINE__, dev->m_region->lpar_addr);
 
-        result = ps3_alloc_io_irq(PS3_BINDING_CPU_ANY, dev->interrupt_id, &virq);
+        result = ps3_io_irq_setup(PS3_BINDING_CPU_ANY, dev->interrupt_id, &virq);
 
         if (result) {
                 dev_dbg(&dev->core, "%s:%d: ps3_construct_io_irq(%d) failed.\n",
@@ -162,7 +162,7 @@ fail_add_hcd:
 fail_ioremap:
         usb_put_hcd(hcd);
 fail_create_hcd:
-        ps3_free_io_irq(virq);
+        ps3_io_irq_destroy(virq);
 fail_irq:
         ps3_free_mmio_region(dev->m_region);
 fail_mmio:
diff --git a/drivers/usb/host/ohci-ps3.c b/drivers/usb/host/ohci-ps3.c
index 62283a3926de..93a6eb0de2d1 100644
--- a/drivers/usb/host/ohci-ps3.c
+++ b/drivers/usb/host/ohci-ps3.c
@@ -107,7 +107,7 @@ static int ps3_ohci_sb_probe(struct ps3_system_bus_device *dev)
         dev_dbg(&dev->core, "%s:%d: mmio mapped_addr %lxh\n", __func__,
                 __LINE__, dev->m_region->lpar_addr);
 
-        result = ps3_alloc_io_irq(PS3_BINDING_CPU_ANY, dev->interrupt_id, &virq);
+        result = ps3_io_irq_setup(PS3_BINDING_CPU_ANY, dev->interrupt_id, &virq);
 
         if (result) {
                 dev_dbg(&dev->core, "%s:%d: ps3_construct_io_irq(%d) failed.\n",
@@ -165,7 +165,7 @@ fail_add_hcd:
 fail_ioremap:
         usb_put_hcd(hcd);
 fail_create_hcd:
-        ps3_free_io_irq(virq);
+        ps3_io_irq_destroy(virq);
 fail_irq:
         ps3_free_mmio_region(dev->m_region);
 fail_mmio:
diff --git a/drivers/video/ps3fb.c b/drivers/video/ps3fb.c
index 81e43cda7d8b..a9ca4986645c 100644
--- a/drivers/video/ps3fb.c
+++ b/drivers/video/ps3fb.c
@@ -885,8 +885,8 @@ static int ps3fb_vsync_settings(struct gpu_driver_info *dinfo, void *dev)
         }
 
         ps3fb.dev = dev;
-        error = ps3_alloc_irq(PS3_BINDING_CPU_ANY, dinfo->irq.irq_outlet,
-                              &ps3fb.irq_no);
+        error = ps3_irq_plug_setup(PS3_BINDING_CPU_ANY, dinfo->irq.irq_outlet,
+                                   &ps3fb.irq_no);
         if (error) {
                 printk(KERN_ERR "%s: ps3_alloc_irq failed %d\n", __FUNCTION__,
                        error);
@@ -898,7 +898,7 @@ static int ps3fb_vsync_settings(struct gpu_driver_info *dinfo, void *dev)
         if (error) {
                 printk(KERN_ERR "%s: request_irq failed %d\n", __FUNCTION__,
                        error);
-                ps3_free_irq(ps3fb.irq_no);
+                ps3_irq_plug_destroy(ps3fb.irq_no);
                 return error;
         }
 
@@ -1059,7 +1059,7 @@ err_framebuffer_release:
         framebuffer_release(info);
 err_free_irq:
         free_irq(ps3fb.irq_no, ps3fb.dev);
-        ps3_free_irq(ps3fb.irq_no);
+        ps3_irq_plug_destroy(ps3fb.irq_no);
 err_iounmap_dinfo:
         iounmap((u8 __iomem *)ps3fb.dinfo);
 err_gpu_context_free:
@@ -1075,7 +1075,7 @@ static void ps3fb_shutdown(struct platform_device *dev)
         ps3fb_flip_ctl(0);      /* flip off */
         ps3fb.dinfo->irq.mask = 0;
         free_irq(ps3fb.irq_no, ps3fb.dev);
-        ps3_free_irq(ps3fb.irq_no);
+        ps3_irq_plug_destroy(ps3fb.irq_no);
         iounmap((u8 __iomem *)ps3fb.dinfo);
 }
 
@@ -1085,7 +1085,7 @@ void ps3fb_cleanup(void)
 
         if (ps3fb.irq_no) {
                 free_irq(ps3fb.irq_no, ps3fb.dev);
-                ps3_free_irq(ps3fb.irq_no);
+                ps3_irq_plug_destroy(ps3fb.irq_no);
         }
         iounmap((u8 __iomem *)ps3fb.dinfo);