1 files changed, 7 insertions, 8 deletions

diff --git a/drivers/media/video/s5p-mfc/s5p_mfc.c b/drivers/media/video/s5p-mfc/s5p_mfc.c
index 7dc7eab58b3..8be8b54eb74 100644
--- a/drivers/media/video/s5p-mfc/s5p_mfc.c
+++ b/drivers/media/video/s5p-mfc/s5p_mfc.c
@@ -202,7 +202,7 @@ static void s5p_mfc_handle_frame_copy_time(struct s5p_mfc_ctx *ctx)
            appropraite flags */
         src_buf = list_entry(ctx->src_queue.next, struct s5p_mfc_buf, list);
         list_for_each_entry(dst_buf, &ctx->dst_queue, list) {
-                if (vb2_dma_contig_plane_paddr(dst_buf->b, 0) == dec_y_addr) {
+                if (vb2_dma_contig_plane_dma_addr(dst_buf->b, 0) == dec_y_addr) {
                         memcpy(&dst_buf->b->v4l2_buf.timecode,
                                 &src_buf->b->v4l2_buf.timecode,
                                 sizeof(struct v4l2_timecode));
@@ -248,7 +248,7 @@ static void s5p_mfc_handle_frame_new(struct s5p_mfc_ctx *ctx, unsigned int err)
          * check which videobuf does it correspond to */
         list_for_each_entry(dst_buf, &ctx->dst_queue, list) {
                 /* Check if this is the buffer we're looking for */
-                if (vb2_dma_contig_plane_paddr(dst_buf->b, 0) == dspl_y_addr) {
+                if (vb2_dma_contig_plane_dma_addr(dst_buf->b, 0) == dspl_y_addr) {
                         list_del(&dst_buf->list);
                         ctx->dst_queue_cnt--;
                         dst_buf->b->v4l2_buf.sequence = ctx->sequence;
@@ -940,9 +940,8 @@ static int match_child(struct device *dev, void *data)
         return !strcmp(dev_name(dev), (char *)data);
 }
 
-
 /* MFC probe function */
-static int __devinit s5p_mfc_probe(struct platform_device *pdev)
+static int s5p_mfc_probe(struct platform_device *pdev)
 {
         struct s5p_mfc_dev *dev;
         struct video_device *vfd;
@@ -1236,7 +1235,7 @@ static const struct dev_pm_ops s5p_mfc_pm_ops = {
                            NULL)
 };
 
-static struct platform_driver s5p_mfc_pdrv = {
+static struct platform_driver s5p_mfc_driver = {
         .probe  = s5p_mfc_probe,
         .remove = __devexit_p(s5p_mfc_remove),
         .driver = {
@@ -1254,15 +1253,15 @@ static int __init s5p_mfc_init(void)
         int ret;
 
         pr_info("%s", banner);
-        ret = platform_driver_register(&s5p_mfc_pdrv);
+        ret = platform_driver_register(&s5p_mfc_driver);
         if (ret)
                 pr_err("Platform device registration failed.\n");
         return ret;
 }
 
-static void __devexit s5p_mfc_exit(void)
+static void __exit s5p_mfc_exit(void)
 {
-        platform_driver_unregister(&s5p_mfc_pdrv);
+        platform_driver_unregister(&s5p_mfc_driver);
 }
 
 module_init(s5p_mfc_init);