aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/ps3fb.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/video/ps3fb.c')
-rw-r--r--drivers/video/ps3fb.c12
1 files changed, 6 insertions, 6 deletions
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)
885 } 885 }
886 886
887 ps3fb.dev = dev; 887 ps3fb.dev = dev;
888 error = ps3_alloc_irq(PS3_BINDING_CPU_ANY, dinfo->irq.irq_outlet, 888 error = ps3_irq_plug_setup(PS3_BINDING_CPU_ANY, dinfo->irq.irq_outlet,
889 &ps3fb.irq_no); 889 &ps3fb.irq_no);
890 if (error) { 890 if (error) {
891 printk(KERN_ERR "%s: ps3_alloc_irq failed %d\n", __FUNCTION__, 891 printk(KERN_ERR "%s: ps3_alloc_irq failed %d\n", __FUNCTION__,
892 error); 892 error);
@@ -898,7 +898,7 @@ static int ps3fb_vsync_settings(struct gpu_driver_info *dinfo, void *dev)
898 if (error) { 898 if (error) {
899 printk(KERN_ERR "%s: request_irq failed %d\n", __FUNCTION__, 899 printk(KERN_ERR "%s: request_irq failed %d\n", __FUNCTION__,
900 error); 900 error);
901 ps3_free_irq(ps3fb.irq_no); 901 ps3_irq_plug_destroy(ps3fb.irq_no);
902 return error; 902 return error;
903 } 903 }
904 904
@@ -1059,7 +1059,7 @@ err_framebuffer_release:
1059 framebuffer_release(info); 1059 framebuffer_release(info);
1060err_free_irq: 1060err_free_irq:
1061 free_irq(ps3fb.irq_no, ps3fb.dev); 1061 free_irq(ps3fb.irq_no, ps3fb.dev);
1062 ps3_free_irq(ps3fb.irq_no); 1062 ps3_irq_plug_destroy(ps3fb.irq_no);
1063err_iounmap_dinfo: 1063err_iounmap_dinfo:
1064 iounmap((u8 __iomem *)ps3fb.dinfo); 1064 iounmap((u8 __iomem *)ps3fb.dinfo);
1065err_gpu_context_free: 1065err_gpu_context_free:
@@ -1075,7 +1075,7 @@ static void ps3fb_shutdown(struct platform_device *dev)
1075 ps3fb_flip_ctl(0); /* flip off */ 1075 ps3fb_flip_ctl(0); /* flip off */
1076 ps3fb.dinfo->irq.mask = 0; 1076 ps3fb.dinfo->irq.mask = 0;
1077 free_irq(ps3fb.irq_no, ps3fb.dev); 1077 free_irq(ps3fb.irq_no, ps3fb.dev);
1078 ps3_free_irq(ps3fb.irq_no); 1078 ps3_irq_plug_destroy(ps3fb.irq_no);
1079 iounmap((u8 __iomem *)ps3fb.dinfo); 1079 iounmap((u8 __iomem *)ps3fb.dinfo);
1080} 1080}
1081 1081
@@ -1085,7 +1085,7 @@ void ps3fb_cleanup(void)
1085 1085
1086 if (ps3fb.irq_no) { 1086 if (ps3fb.irq_no) {
1087 free_irq(ps3fb.irq_no, ps3fb.dev); 1087 free_irq(ps3fb.irq_no, ps3fb.dev);
1088 ps3_free_irq(ps3fb.irq_no); 1088 ps3_irq_plug_destroy(ps3fb.irq_no);
1089 } 1089 }
1090 iounmap((u8 __iomem *)ps3fb.dinfo); 1090 iounmap((u8 __iomem *)ps3fb.dinfo);
1091 1091