From nobody Mon Apr 6 16:21:46 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AF0BEC433FE for ; Tue, 4 Oct 2022 09:31:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229766AbiJDJbM (ORCPT ); Tue, 4 Oct 2022 05:31:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52094 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229526AbiJDJ1t (ORCPT ); Tue, 4 Oct 2022 05:27:49 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A70AE268; Tue, 4 Oct 2022 02:27:11 -0700 (PDT) Date: Tue, 04 Oct 2022 09:27:09 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1664875630; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=bjO1yx2ZmJ/fwGYbywClmLhI9D7iW4UUWVmJvkwsN2A=; b=lx1wOLFV5R5OYy/hNntAmOk9dE/cWq1CVHyJg3I8iaMgfNdXaLIiS3p9fZR2msJCBU2s2a 3CwKPab92oMB44vUTVsMK8sJIBGqcHZN+CKD1iXZxPWcXjXbqdOO9eko7OIGOTkjtUN30g VJqjinJ7yIUR4cN3JT7pQyF0wvqqeGOWHb8G0NI4vgUFFQuLYyU3cjTKX7SQBUI+/U4b8Y c94N92vmoMxkHjxqESHnhLykYfhQCWpmSM4g9eqpnXgDSOsAkZ7RsuxBfM+AtUnksuK6B1 JDT4zLyCr68N04DS1Ms8Mhyq1m+khnc0uIrJuRYq1jKhmcE6/sPzbapLGzxlMQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1664875630; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=bjO1yx2ZmJ/fwGYbywClmLhI9D7iW4UUWVmJvkwsN2A=; b=cyzK8yH0M0x0Uooc4sTyq37ToP428aKESmlimqIvyW5bUHnllSXuQr9ADziCsjUd5e5osx 6xnkfhfmMXYfEmAg== From: "tip-bot2 for Tony Lindgren" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: timers/core] clocksource/drivers/timer-ti-dm: Get clock in probe with devm_clk_get() Cc: Tony Lindgren , Janusz Krzysztofik , Daniel Lezcano , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20220815131250.34603-10-tony@atomide.com> References: <20220815131250.34603-10-tony@atomide.com> MIME-Version: 1.0 Message-ID: <166487562906.401.7725425779932812533.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the timers/core branch of tip: Commit-ID: 789d4b1070261fa98b06384d2067f23c080dc9f1 Gitweb: https://git.kernel.org/tip/789d4b1070261fa98b06384d2067f23c0= 80dc9f1 Author: Tony Lindgren AuthorDate: Mon, 15 Aug 2022 16:12:50 +03:00 Committer: Daniel Lezcano CommitterDate: Tue, 20 Sep 2022 10:49:46 +02:00 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: Tony Lindgren Reviewed-by: Janusz Krzysztofik Link: https://lore.kernel.org/r/20220815131250.34603-10-tony@atomide.com Signed-off-by: Daniel Lezcano --- drivers/clocksource/timer-ti-dm.c | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/drivers/clocksource/timer-ti-dm.c b/drivers/clocksource/timer-= ti-dm.c index 2310f97..cad29de 100644 --- a/drivers/clocksource/timer-ti-dm.c +++ b/drivers/clocksource/timer-ti-dm.c @@ -473,18 +473,6 @@ static int omap_dm_timer_prepare(struct dmtimer *timer) struct device *dev =3D &timer->pdev->dev; int rc; =20 - /* - * 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 =3D 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 =3D pm_runtime_resume_and_get(dev); if (rc) return rc; @@ -650,8 +638,6 @@ static int omap_dm_timer_free(struct omap_dm_timer *coo= kie) if (unlikely(!timer)) return -EINVAL; =20 - clk_put(timer->fclk); - WARN_ON(!timer->reserved); timer->reserved =3D 0; return 0; @@ -1098,7 +1084,6 @@ static int omap_dm_timer_probe(struct platform_device= *pdev) if (timer->irq < 0) return timer->irq; =20 - timer->fclk =3D ERR_PTR(-ENODEV); timer->io_base =3D 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_devic= e *pdev) =20 timer->omap1 =3D timer->capability & OMAP_TIMER_NEEDS_RESET; =20 + /* OMAP1 devices do not yet use the clock framework for dmtimers */ + if (!timer->omap1) { + timer->fclk =3D devm_clk_get(dev, "fck"); + if (IS_ERR(timer->fclk)) + return PTR_ERR(timer->fclk); + } else { + timer->fclk =3D ERR_PTR(-ENODEV); + } + if (!(timer->capability & OMAP_TIMER_ALWON)) { timer->nb.notifier_call =3D omap_timer_context_notifier; cpu_pm_register_notifier(&timer->nb);