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

Commit d7aba554 authored by Jon Hunter's avatar Jon Hunter
Browse files

ARM: OMAP: Remove unnecessary call to clk_get() 



Whenever we call the function omap_dm_timer_set_source() to set the clock
source of a dmtimer we look-up the dmtimer functional clock source by
calling clk_get(). This is not necessary because on requesting a dmtimer
we look-up the functional clock source and store it in the omap_dm_timer
structure. So instead of looking up the clock again used the clock handle
that stored in the omap_dm_timer structure.

Signed-off-by: default avatarJon Hunter <jon-hunter@ti.com>
Acked-by: default avatarSantosh Shilimkar <santosh.shilimkar@ti.com>
parent 4249d96c

arch/arm/plat-omap/dmtimer.c

+4 −10
Original line number Diff line number Diff line
@@ -448,7 +448,7 @@ int omap_dm_timer_set_source(struct omap_dm_timer *timer, int source) 
{

	int ret;

	char *parent_name = NULL;

	struct clk *fclk, *parent;

	struct clk *parent;

	struct dmtimer_platform_data *pdata;



	if (unlikely(!timer))
@@ -467,11 +467,8 @@ int omap_dm_timer_set_source(struct omap_dm_timer *timer, int source) 
	if (pdata && pdata->set_timer_src)

		return pdata->set_timer_src(timer->pdev, source);



	fclk = clk_get(&timer->pdev->dev, "fck");

	if (IS_ERR_OR_NULL(fclk)) {

		pr_err("%s: fck not found\n", __func__);

	if (!timer->fclk)

		return -EINVAL;

	}



	switch (source) {

	case OMAP_TIMER_SRC_SYS_CLK:
@@ -490,18 +487,15 @@ int omap_dm_timer_set_source(struct omap_dm_timer *timer, int source) 
	parent = clk_get(&timer->pdev->dev, parent_name);

	if (IS_ERR_OR_NULL(parent)) {

		pr_err("%s: %s not found\n", __func__, parent_name);

		ret = -EINVAL;

		goto out;

		return -EINVAL;

	}



	ret = clk_set_parent(fclk, parent);

	ret = clk_set_parent(timer->fclk, parent);

	if (IS_ERR_VALUE(ret))

		pr_err("%s: failed to set %s as parent\n", __func__,

			parent_name);



	clk_put(parent);

out:

	clk_put(fclk);



	return ret;

}