[media] exynos-gsc: Convert gsc_m2m_resume() from int to void

Since gsc_m2m_resume() always returns 0, convert it to a void instead.

[mszyprow: rebased onto v4.9-rc4]

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Tested-by: Javier Martinez Canillas <javier@osg.samsung.com>
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

diff --git a/drivers/media/platform/exynos-gsc/gsc-core.c b/drivers/media/platform/exynos-gsc/gsc-core.c
index 183c6e4e915f015a46953db260cf100430e10f6b..945042c346e731646f9f34b2bf8a4ffb5f9f74f6 100644 (file)
--- a/drivers/media/platform/exynos-gsc/gsc-core.c
+++ b/drivers/media/platform/exynos-gsc/gsc-core.c
@@ -1023,7 +1023,7 @@ static int gsc_m2m_suspend(struct gsc_dev *gsc)
        return timeout == 0 ? -EAGAIN : 0;
 }
 
-static int gsc_m2m_resume(struct gsc_dev *gsc)
+static void gsc_m2m_resume(struct gsc_dev *gsc)
 {
        struct gsc_ctx *ctx;
        unsigned long flags;
@@ -1036,8 +1036,6 @@ static int gsc_m2m_resume(struct gsc_dev *gsc)
 
        if (test_and_clear_bit(ST_M2M_SUSPENDED, &gsc->state))
                gsc_m2m_job_finish(ctx, VB2_BUF_STATE_ERROR);
-
-       return 0;
 }
 
 static int gsc_probe(struct platform_device *pdev)
@@ -1159,8 +1157,9 @@ static int gsc_runtime_resume(struct device *dev)
 
        gsc_hw_set_sw_reset(gsc);
        gsc_wait_reset(gsc);
+       gsc_m2m_resume(gsc);
 
-       return gsc_m2m_resume(gsc);
+       return 0;
 }
 
 static int gsc_runtime_suspend(struct device *dev)