From patchwork Sat Dec 31 12:26:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe JAILLET X-Patchwork-Id: 37837 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp3320170wrt; Sat, 31 Dec 2022 04:30:56 -0800 (PST) X-Google-Smtp-Source: AMrXdXusqASjjvyLB7P+PlEtzzAhSxwClahxjeO05xaOC1d5fCWHJXFy3Da/3MIT+aPju8QbC+GO X-Received: by 2002:a05:6a20:8e0b:b0:ac:706e:178c with SMTP id y11-20020a056a208e0b00b000ac706e178cmr54191051pzj.26.1672489856613; Sat, 31 Dec 2022 04:30:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672489856; cv=none; d=google.com; s=arc-20160816; b=lL1O6NQEOnSc5+e60bbTJ3WodlCJvR6qshB96IkyvEzAcP4iecE7zhiJDmfMX/oMjn pMzIXSzduXAgIMtLQV/IWLtWGXL1JZUVPOLMndtqRHKxW5fq0bboNEyXZWgv2mbEOHMh bokdHwZr99cdt/wVMbAcQXFUX6luof7LjvODZWLxxFE3KevlIa/YLXmWIpv73dw2if3t mDjqxb6NPuDdMl8cgVX15vSLyVqxJJ/lH5id8IuWBg3qx3XH6SSmjKxzPtM3UNgEuSyA RCNq8MPKJO11AEvM9RYrGXWOx5kFvbW7eQoKsV2zIf+yQGJLb7BMqpuBAGG7++zyEJXx iVEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=mOPWCeaCv/2o03V9GdbrJG3gOUZG6Q84grzq5n+H9Ec=; b=oEB5ViBv6m1M1wVq/wUTl4ZZhc02oM7F9B/E+1dy+2md8SU9JmiXU1ml1ghIWWUIYK /44QcWnVS4A4px6J2WYQHdcDiHDS9+nfpjNSpPZ4VD2848Fz9tiXazDoh5IryoWLoTbX gm4QSnQOIxA54X5LfN4ipVHyUpMx/yMzyPNS6HW6qpaQhDEwA/zjrIc87dfBPZ3Thued lmQTF8lRomWst4y4UiqLXOk21IuZDV2KOP7+V/X5BkbnZItDKXiDrtLLpvMX7ssTJxss 2mjMsCVSdty1FuynRUhc6kOIZmZ8HSLbsTGdcRhltHO8ESsMqlIAqB6hiCLZFVTqIeEI c3Ng== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q26-20020a63505a000000b004704b5453cbsi24287512pgl.557.2022.12.31.04.30.44; Sat, 31 Dec 2022 04:30:56 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229905AbiLaM0T (ORCPT + 99 others); Sat, 31 Dec 2022 07:26:19 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57030 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229560AbiLaM0R (ORCPT ); Sat, 31 Dec 2022 07:26:17 -0500 Received: from smtp.smtpout.orange.fr (smtp-19.smtpout.orange.fr [80.12.242.19]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 62941265E for ; Sat, 31 Dec 2022 04:26:15 -0800 (PST) Received: from pop-os.home ([86.243.100.34]) by smtp.orange.fr with ESMTPA id BawFpjtO2fxUsBawFpvF3E; Sat, 31 Dec 2022 13:26:13 +0100 X-ME-Helo: pop-os.home X-ME-Auth: Y2hyaXN0b3BoZS5qYWlsbGV0QHdhbmFkb28uZnI= X-ME-Date: Sat, 31 Dec 2022 13:26:13 +0100 X-ME-IP: 86.243.100.34 From: Christophe JAILLET To: Wim Van Sebroeck , Guenter Roeck , Vladimir Zapolskiy Cc: linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, Christophe JAILLET , linux-watchdog@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH] watchdog: lpc18xx: Use devm_clk_get_enabled() helper Date: Sat, 31 Dec 2022 13:26:09 +0100 Message-Id: X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1753732724145474861?= X-GMAIL-MSGID: =?utf-8?q?1753732724145474861?= The devm_clk_get_enabled() helper: - calls devm_clk_get() - calls clk_prepare_enable() and registers what is needed in order to call clk_disable_unprepare() when needed, as a managed resource. This simplifies the code and avoids the need of a dedicated function used with devm_add_action_or_reset(). Signed-off-by: Christophe JAILLET Reviewed-by: Guenter Roeck --- Note that the order of operations is slightly modified by this patch. The "reg" clk is now prepare_enable()'ed before clk_get("wdtclk"). --- drivers/watchdog/lpc18xx_wdt.c | 30 ++---------------------------- 1 file changed, 2 insertions(+), 28 deletions(-) diff --git a/drivers/watchdog/lpc18xx_wdt.c b/drivers/watchdog/lpc18xx_wdt.c index 60b6d74f267d..1b9b5f21a0df 100644 --- a/drivers/watchdog/lpc18xx_wdt.c +++ b/drivers/watchdog/lpc18xx_wdt.c @@ -197,16 +197,10 @@ static const struct watchdog_ops lpc18xx_wdt_ops = { .restart = lpc18xx_wdt_restart, }; -static void lpc18xx_clk_disable_unprepare(void *data) -{ - clk_disable_unprepare(data); -} - static int lpc18xx_wdt_probe(struct platform_device *pdev) { struct lpc18xx_wdt_dev *lpc18xx_wdt; struct device *dev = &pdev->dev; - int ret; lpc18xx_wdt = devm_kzalloc(dev, sizeof(*lpc18xx_wdt), GFP_KERNEL); if (!lpc18xx_wdt) @@ -216,38 +210,18 @@ static int lpc18xx_wdt_probe(struct platform_device *pdev) if (IS_ERR(lpc18xx_wdt->base)) return PTR_ERR(lpc18xx_wdt->base); - lpc18xx_wdt->reg_clk = devm_clk_get(dev, "reg"); + lpc18xx_wdt->reg_clk = devm_clk_get_enabled(dev, "reg"); if (IS_ERR(lpc18xx_wdt->reg_clk)) { dev_err(dev, "failed to get the reg clock\n"); return PTR_ERR(lpc18xx_wdt->reg_clk); } - lpc18xx_wdt->wdt_clk = devm_clk_get(dev, "wdtclk"); + lpc18xx_wdt->wdt_clk = devm_clk_get_enabled(dev, "wdtclk"); if (IS_ERR(lpc18xx_wdt->wdt_clk)) { dev_err(dev, "failed to get the wdt clock\n"); return PTR_ERR(lpc18xx_wdt->wdt_clk); } - ret = clk_prepare_enable(lpc18xx_wdt->reg_clk); - if (ret) { - dev_err(dev, "could not prepare or enable sys clock\n"); - return ret; - } - ret = devm_add_action_or_reset(dev, lpc18xx_clk_disable_unprepare, - lpc18xx_wdt->reg_clk); - if (ret) - return ret; - - ret = clk_prepare_enable(lpc18xx_wdt->wdt_clk); - if (ret) { - dev_err(dev, "could not prepare or enable wdt clock\n"); - return ret; - } - ret = devm_add_action_or_reset(dev, lpc18xx_clk_disable_unprepare, - lpc18xx_wdt->wdt_clk); - if (ret) - return ret; - /* We use the clock rate to calculate timeouts */ lpc18xx_wdt->clk_rate = clk_get_rate(lpc18xx_wdt->wdt_clk); if (lpc18xx_wdt->clk_rate == 0) {