Merge branch 'for-3.5-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...

[firefly-linux-kernel-4.4.55.git] / drivers / media / video / s5p-mfc / s5p_mfc.c

diff --git a/drivers/media/video/s5p-mfc/s5p_mfc.c b/drivers/media/video/s5p-mfc/s5p_mfc.c
index 83fe461af263529df7502f020886f58d63b68c1c..9bb68e7b5ae80833b827586fbf09a5642495d050 100644 (file)
--- a/drivers/media/video/s5p-mfc/s5p_mfc.c
+++ b/drivers/media/video/s5p-mfc/s5p_mfc.c
@@ -70,7 +70,7 @@ static void wake_up_dev(struct s5p_mfc_dev *dev, unsigned int reason,
        wake_up(&dev->queue);
 }
 
-void s5p_mfc_watchdog(unsigned long arg)
+static void s5p_mfc_watchdog(unsigned long arg)
 {
        struct s5p_mfc_dev *dev = (struct s5p_mfc_dev *)arg;
 
@@ -373,7 +373,7 @@ static void s5p_mfc_handle_error(struct s5p_mfc_ctx *ctx,
 
        /* If no context is available then all necessary
         * processing has been done. */
-       if (ctx == 0)
+       if (ctx == NULL)
                return;
 
        dev = ctx->dev;
@@ -429,7 +429,7 @@ static void s5p_mfc_handle_seq_done(struct s5p_mfc_ctx *ctx,
        struct s5p_mfc_dev *dev;
        unsigned int guard_width, guard_height;
 
-       if (ctx == 0)
+       if (ctx == NULL)
                return;
        dev = ctx->dev;
        if (ctx->c_ops->post_seq_start) {
@@ -496,7 +496,7 @@ static void s5p_mfc_handle_init_buffers(struct s5p_mfc_ctx *ctx,
        struct s5p_mfc_dev *dev;
        unsigned long flags;
 
-       if (ctx == 0)
+       if (ctx == NULL)
                return;
        dev = ctx->dev;
        s5p_mfc_clear_int_flags(dev);
@@ -772,7 +772,7 @@ err_queue_init:
 err_init_hw:
        s5p_mfc_release_firmware(dev);
 err_alloc_fw:
-       dev->ctx[ctx->num] = 0;
+       dev->ctx[ctx->num] = NULL;
        del_timer_sync(&dev->watchdog_timer);
        s5p_mfc_clock_off();
 err_pwr_enable:
@@ -849,7 +849,7 @@ static int s5p_mfc_release(struct file *file)
        }
        mfc_debug(2, "Shutting down clock\n");
        s5p_mfc_clock_off();
-       dev->ctx[ctx->num] = 0;
+       dev->ctx[ctx->num] = NULL;
        s5p_mfc_dec_ctrls_delete(ctx);
        v4l2_fh_del(&ctx->fh);
        v4l2_fh_exit(&ctx->fh);
@@ -948,7 +948,7 @@ static int s5p_mfc_probe(struct platform_device *pdev)
        int ret;
 
        pr_debug("%s++\n", __func__);
-       dev = kzalloc(sizeof *dev, GFP_KERNEL);
+       dev = devm_kzalloc(&pdev->dev, sizeof *dev, GFP_KERNEL);
        if (!dev) {
                dev_err(&pdev->dev, "Not enough memory for MFC device\n");
                return -ENOMEM;
@@ -959,49 +959,35 @@ static int s5p_mfc_probe(struct platform_device *pdev)
        dev->plat_dev = pdev;
        if (!dev->plat_dev) {
                dev_err(&pdev->dev, "No platform data specified\n");
-               ret = -ENODEV;
-               goto err_dev;
+               return -ENODEV;
        }
 
        ret = s5p_mfc_init_pm(dev);
        if (ret < 0) {
                dev_err(&pdev->dev, "failed to get mfc clock source\n");
-               goto err_clk;
+               return ret;
        }
 
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       if (res == NULL) {
-               dev_err(&pdev->dev, "failed to get memory region resource\n");
-               ret = -ENOENT;
-               goto err_res;
-       }
 
-       dev->mfc_mem = request_mem_region(res->start, resource_size(res),
-                                         pdev->name);
-       if (dev->mfc_mem == NULL) {
-               dev_err(&pdev->dev, "failed to get memory region\n");
-               ret = -ENOENT;
-               goto err_mem_reg;
-       }
-       dev->regs_base = ioremap(dev->mfc_mem->start, resource_size(dev->mfc_mem));
+       dev->regs_base = devm_request_and_ioremap(&pdev->dev, res);
        if (dev->regs_base == NULL) {
-               dev_err(&pdev->dev, "failed to ioremap address region\n");
-               ret = -ENOENT;
-               goto err_ioremap;
+               dev_err(&pdev->dev, "Failed to obtain io memory\n");
+               return -ENOENT;
        }
 
        res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
        if (res == NULL) {
                dev_err(&pdev->dev, "failed to get irq resource\n");
                ret = -ENOENT;
-               goto err_get_res;
+               goto err_res;
        }
        dev->irq = res->start;
-       ret = request_irq(dev->irq, s5p_mfc_irq, IRQF_DISABLED, pdev->name,
-                                                                       dev);
+       ret = devm_request_irq(&pdev->dev, dev->irq, s5p_mfc_irq,
+                                       IRQF_DISABLED, pdev->name, dev);
        if (ret) {
                dev_err(&pdev->dev, "Failed to install irq (%d)\n", ret);
-               goto err_req_irq;
+               goto err_res;
        }
 
        dev->mem_dev_l = device_find_child(&dev->plat_dev->dev, "s5p-mfc-l",
@@ -1009,20 +995,20 @@ static int s5p_mfc_probe(struct platform_device *pdev)
        if (!dev->mem_dev_l) {
                mfc_err("Mem child (L) device get failed\n");
                ret = -ENODEV;
-               goto err_find_child;
+               goto err_res;
        }
        dev->mem_dev_r = device_find_child(&dev->plat_dev->dev, "s5p-mfc-r",
                                           match_child);
        if (!dev->mem_dev_r) {
                mfc_err("Mem child (R) device get failed\n");
                ret = -ENODEV;
-               goto err_find_child;
+               goto err_res;
        }
 
        dev->alloc_ctx[0] = vb2_dma_contig_init_ctx(dev->mem_dev_l);
        if (IS_ERR_OR_NULL(dev->alloc_ctx[0])) {
                ret = PTR_ERR(dev->alloc_ctx[0]);
-               goto err_mem_init_ctx_0;
+               goto err_res;
        }
        dev->alloc_ctx[1] = vb2_dma_contig_init_ctx(dev->mem_dev_r);
        if (IS_ERR_OR_NULL(dev->alloc_ctx[1])) {
@@ -1048,6 +1034,10 @@ static int s5p_mfc_probe(struct platform_device *pdev)
        vfd->ioctl_ops  = get_dec_v4l2_ioctl_ops();
        vfd->release    = video_device_release,
        vfd->lock       = &dev->mfc_mutex;
+       /* Locking in file operations other than ioctl should be done
+          by the driver, not the V4L2 core.
+          This driver needs auditing so that this flag can be removed. */
+       set_bit(V4L2_FL_LOCK_ALL_FOPS, &vfd->flags);
        vfd->v4l2_dev   = &dev->v4l2_dev;
        snprintf(vfd->name, sizeof(vfd->name), "%s", S5P_MFC_DEC_NAME);
        dev->vfd_dec    = vfd;
@@ -1072,6 +1062,8 @@ static int s5p_mfc_probe(struct platform_device *pdev)
        vfd->ioctl_ops  = get_enc_v4l2_ioctl_ops();
        vfd->release    = video_device_release,
        vfd->lock       = &dev->mfc_mutex;
+       /* This should not be necessary */
+       set_bit(V4L2_FL_LOCK_ALL_FOPS, &vfd->flags);
        vfd->v4l2_dev   = &dev->v4l2_dev;
        snprintf(vfd->name, sizeof(vfd->name), "%s", S5P_MFC_ENC_NAME);
        dev->vfd_enc    = vfd;
@@ -1110,22 +1102,9 @@ err_v4l2_dev_reg:
        vb2_dma_contig_cleanup_ctx(dev->alloc_ctx[1]);
 err_mem_init_ctx_1:
        vb2_dma_contig_cleanup_ctx(dev->alloc_ctx[0]);
-err_mem_init_ctx_0:
-err_find_child:
-       free_irq(dev->irq, dev);
-err_req_irq:
-err_get_res:
-       iounmap(dev->regs_base);
-       dev->regs_base = NULL;
-err_ioremap:
-       release_resource(dev->mfc_mem);
-       kfree(dev->mfc_mem);
-err_mem_reg:
 err_res:
        s5p_mfc_final_pm(dev);
-err_clk:
-err_dev:
-       kfree(dev);
+
        pr_debug("%s-- with error\n", __func__);
        return ret;
 
@@ -1148,15 +1127,7 @@ static int __devexit s5p_mfc_remove(struct platform_device *pdev)
        vb2_dma_contig_cleanup_ctx(dev->alloc_ctx[0]);
        vb2_dma_contig_cleanup_ctx(dev->alloc_ctx[1]);
 
-       free_irq(dev->irq, dev);
-       iounmap(dev->regs_base);
-       if (dev->mfc_mem) {
-               release_resource(dev->mfc_mem);
-               kfree(dev->mfc_mem);
-               dev->mfc_mem = NULL;
-       }
        s5p_mfc_final_pm(dev);
-       kfree(dev);
        return 0;
 }