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

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

[media] exynos-gsc: Rearrange error messages for valid prints 



In case of clk_prepare failure, the function gsc_clk_get also prints
"failed to get clock" which is not correct. Hence move the error
messages to their respective blocks. While at it, also renamed the labels
meaningfully.

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 2c8cc13f

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

+10 −9
Original line number Diff line number Diff line
@@ -1017,25 +1017,26 @@ 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);

	if (IS_ERR(gsc->clock))

		goto err_print;

	if (IS_ERR(gsc->clock)) {

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

			GSC_CLOCK_GATE_NAME);

		goto err_clk_get;

	}



	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 = NULL;

		goto err;

		goto err_clk_prepare;

	}



	return 0;



err:

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

					GSC_CLOCK_GATE_NAME);

err_clk_prepare:

	gsc_clk_put(gsc);

err_print:

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

					GSC_CLOCK_GATE_NAME);

err_clk_get:

	return -ENXIO;

}