diff options
Diffstat (limited to 'drivers/video/ps3fb.c')
-rw-r--r-- | drivers/video/ps3fb.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/video/ps3fb.c b/drivers/video/ps3fb.c index 07d1979bc23e..9756a728b74f 100644 --- a/drivers/video/ps3fb.c +++ b/drivers/video/ps3fb.c | |||
@@ -898,8 +898,8 @@ static int ps3fb_vsync_settings(struct gpu_driver_info *dinfo, void *dev) | |||
898 | } | 898 | } |
899 | 899 | ||
900 | ps3fb.dev = dev; | 900 | ps3fb.dev = dev; |
901 | error = ps3_alloc_irq(PS3_BINDING_CPU_ANY, dinfo->irq.irq_outlet, | 901 | error = ps3_irq_plug_setup(PS3_BINDING_CPU_ANY, dinfo->irq.irq_outlet, |
902 | &ps3fb.irq_no); | 902 | &ps3fb.irq_no); |
903 | if (error) { | 903 | if (error) { |
904 | printk(KERN_ERR "%s: ps3_alloc_irq failed %d\n", __func__, | 904 | printk(KERN_ERR "%s: ps3_alloc_irq failed %d\n", __func__, |
905 | error); | 905 | error); |
@@ -911,7 +911,7 @@ static int ps3fb_vsync_settings(struct gpu_driver_info *dinfo, void *dev) | |||
911 | if (error) { | 911 | if (error) { |
912 | printk(KERN_ERR "%s: request_irq failed %d\n", __func__, | 912 | printk(KERN_ERR "%s: request_irq failed %d\n", __func__, |
913 | error); | 913 | error); |
914 | ps3_free_irq(ps3fb.irq_no); | 914 | ps3_irq_plug_destroy(ps3fb.irq_no); |
915 | return error; | 915 | return error; |
916 | } | 916 | } |
917 | 917 | ||
@@ -1083,7 +1083,7 @@ err_framebuffer_release: | |||
1083 | framebuffer_release(info); | 1083 | framebuffer_release(info); |
1084 | err_free_irq: | 1084 | err_free_irq: |
1085 | free_irq(ps3fb.irq_no, ps3fb.dev); | 1085 | free_irq(ps3fb.irq_no, ps3fb.dev); |
1086 | ps3_free_irq(ps3fb.irq_no); | 1086 | ps3_irq_plug_destroy(ps3fb.irq_no); |
1087 | err_iounmap_dinfo: | 1087 | err_iounmap_dinfo: |
1088 | iounmap((u8 __iomem *)ps3fb.dinfo); | 1088 | iounmap((u8 __iomem *)ps3fb.dinfo); |
1089 | err_gpu_context_free: | 1089 | err_gpu_context_free: |
@@ -1099,7 +1099,7 @@ static void ps3fb_shutdown(struct platform_device *dev) | |||
1099 | ps3fb_flip_ctl(0); /* flip off */ | 1099 | ps3fb_flip_ctl(0); /* flip off */ |
1100 | ps3fb.dinfo->irq.mask = 0; | 1100 | ps3fb.dinfo->irq.mask = 0; |
1101 | free_irq(ps3fb.irq_no, ps3fb.dev); | 1101 | free_irq(ps3fb.irq_no, ps3fb.dev); |
1102 | ps3_free_irq(ps3fb.irq_no); | 1102 | ps3_irq_plug_destroy(ps3fb.irq_no); |
1103 | iounmap((u8 __iomem *)ps3fb.dinfo); | 1103 | iounmap((u8 __iomem *)ps3fb.dinfo); |
1104 | } | 1104 | } |
1105 | 1105 | ||
@@ -1114,7 +1114,7 @@ void ps3fb_cleanup(void) | |||
1114 | } | 1114 | } |
1115 | if (ps3fb.irq_no) { | 1115 | if (ps3fb.irq_no) { |
1116 | free_irq(ps3fb.irq_no, ps3fb.dev); | 1116 | free_irq(ps3fb.irq_no, ps3fb.dev); |
1117 | ps3_free_irq(ps3fb.irq_no); | 1117 | ps3_irq_plug_destroy(ps3fb.irq_no); |
1118 | } | 1118 | } |
1119 | iounmap((u8 __iomem *)ps3fb.dinfo); | 1119 | iounmap((u8 __iomem *)ps3fb.dinfo); |
1120 | 1120 | ||