Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e2732ae5 authored by Sachin Kamat's avatar Sachin Kamat Committed by Mauro Carvalho Chehab
Browse files

[media] exynos-gsc: Use devm_clk_get() 



devm_clk_get() is a device managed function and makes error handling
a bit simpler.

Signed-off-by: default avatarSachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 21ae96d3

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

+4 −13
Original line number Diff line number Diff line
@@ -1002,11 +1002,8 @@ static void *gsc_get_drv_data(struct platform_device *pdev) 


static void gsc_clk_put(struct gsc_dev *gsc)

{

	if (!IS_ERR(gsc->clock)) {

	if (!IS_ERR(gsc->clock))

		clk_unprepare(gsc->clock);

		clk_put(gsc->clock);

		gsc->clock = NULL;

	}

}



static int gsc_clk_get(struct gsc_dev *gsc)
@@ -1015,28 +1012,22 @@ static int gsc_clk_get(struct gsc_dev *gsc) 


	dev_dbg(&gsc->pdev->dev, "gsc_clk_get Called\n");



	gsc->clock = clk_get(&gsc->pdev->dev, GSC_CLOCK_GATE_NAME);

	gsc->clock = devm_clk_get(&gsc->pdev->dev, GSC_CLOCK_GATE_NAME);

	if (IS_ERR(gsc->clock)) {

		dev_err(&gsc->pdev->dev, "failed to get clock~~~: %s\n",

			GSC_CLOCK_GATE_NAME);

		goto err_clk_get;

		return PTR_ERR(gsc->clock);

	}



	ret = clk_prepare(gsc->clock);

	if (ret < 0) {

		dev_err(&gsc->pdev->dev, "clock prepare failed for clock: %s\n",

			GSC_CLOCK_GATE_NAME);

		clk_put(gsc->clock);

		gsc->clock = ERR_PTR(-EINVAL);

		goto err_clk_prepare;

		return ret;

	}



	return 0;



err_clk_prepare:

	gsc_clk_put(gsc);

err_clk_get:

	return -ENXIO;

}



static int gsc_m2m_suspend(struct gsc_dev *gsc)