Commit 789d4b10 authored by Tony Lindgren's avatar Tony Lindgren Committed by Daniel Lezcano
Browse files

clocksource/drivers/timer-ti-dm: Get clock in probe with devm_clk_get() 



We can simplify the code a bit by getting the clock in probe, and using
devm_clk_get(). This will also make further changes easier as the clock
is available in probe instead of prepare.

Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
Reviewed-by: default avatarJanusz Krzysztofik <jmkrzyszt@gmail.com>
Link: https://lore.kernel.org/r/20220815131250.34603-10-tony@atomide.com


Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
parent 664ad59d

drivers/clocksource/timer-ti-dm.c

+9 −15
Original line number Diff line number Diff line
@@ -473,18 +473,6 @@ static int omap_dm_timer_prepare(struct dmtimer *timer) 
	struct device *dev = &timer->pdev->dev;

	int rc;



	/*

	 * FIXME: OMAP1 devices do not use the clock framework for dmtimers so

	 * do not call clk_get() for these devices.

	 */

	if (!timer->omap1) {

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

		if (WARN_ON_ONCE(IS_ERR(timer->fclk))) {

			dev_err(&timer->pdev->dev, ": No fclk handle.\n");

			return -EINVAL;

		}

	}



	rc = pm_runtime_resume_and_get(dev);

	if (rc)

		return rc;
@@ -650,8 +638,6 @@ static int omap_dm_timer_free(struct omap_dm_timer *cookie) 
	if (unlikely(!timer))

		return -EINVAL;



	clk_put(timer->fclk);



	WARN_ON(!timer->reserved);

	timer->reserved = 0;

	return 0;
@@ -1098,7 +1084,6 @@ static int omap_dm_timer_probe(struct platform_device *pdev) 
	if (timer->irq < 0)

		return timer->irq;



	timer->fclk = ERR_PTR(-ENODEV);

	timer->io_base = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(timer->io_base))

		return PTR_ERR(timer->io_base);
@@ -1122,6 +1107,15 @@ static int omap_dm_timer_probe(struct platform_device *pdev) 


	timer->omap1 = timer->capability & OMAP_TIMER_NEEDS_RESET;



	/* OMAP1 devices do not yet use the clock framework for dmtimers */

	if (!timer->omap1) {

		timer->fclk = devm_clk_get(dev, "fck");

		if (IS_ERR(timer->fclk))

			return PTR_ERR(timer->fclk);

	} else {

		timer->fclk = ERR_PTR(-ENODEV);

	}



	if (!(timer->capability & OMAP_TIMER_ALWON)) {

		timer->nb.notifier_call = omap_timer_context_notifier;

		cpu_pm_register_notifier(&timer->nb);