Commit f9fd6ee6 authored by Ulf Hansson's avatar Ulf Hansson Committed by Mauro Carvalho Chehab
Browse files

[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: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Tested-by: default avatarJavier Martinez Canillas <javier@osg.samsung.com>
Signed-off-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent d83db904

drivers/media/platform/exynos-gsc/gsc-core.c

+3 −4
Original line number Diff line number Diff line
@@ -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)

CRA Git | Maintained and supported by SUSTech CRA and CCSE