From patchwork Sat Dec 31 11:07:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe JAILLET X-Patchwork-Id: 37835 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp3300724wrt; Sat, 31 Dec 2022 03:27:33 -0800 (PST) X-Google-Smtp-Source: AMrXdXuqP+pzeEd2drNyWv6Nz8vdc98FLdpm+mbrl07i+UaQNrmet03XbMRLAikLKBA4230/rSxS X-Received: by 2002:a05:6402:22ad:b0:488:6003:24b6 with SMTP id cx13-20020a05640222ad00b00488600324b6mr1725918edb.40.1672486053181; Sat, 31 Dec 2022 03:27:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672486053; cv=none; d=google.com; s=arc-20160816; b=x0kmzyaMjimbw30MpsvT7uq2xC+LojkQBJqCgVaqZehcwGUPXLPp5+i2Z0YVOF4Lgy +dX2lOTkZga/2hLdIfenWhLqLwqfoPRq5dhS5+9eOqaVVpO2ykJEdBJB2I+y3J49uFn0 3lPyRPqUwbfEoUpEgmcizSj1+sTKx2QgpViTPzenwbk6qyrsU0IUaqCJsfZvSBuEsqfb NLP1BuenxwjubLatiIInd6Y7Z0c2bzNNOXNRWg4euWo8E6uuyf3keiOtF51my6ZEwu4t NRimnSxgR9WxD52FVX90J2oMHdeikFlR5qh8LVVgnyLYfe8S7DNdPtiwjDsaXxV3XMC0 mXZg== 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=zSyFePTDoEDUgYmSWfJbYOVwj8uiYb3AAkUWKWjjeDA=; b=VZ92fmYLALtnlc0CeMvSahRvYtZkZYXd2a7ygnJJiIjHXVB5BX9KQaOK8+RGaEGhlL Ur+X63G/xsplcS1n7HO43YJlgfr6C5k/Is268/XyeUX0ObJPa1gVTEtEf7ys3YXOATcY 7hcF2lXvBuqxc1uYlMxvLLvXZT6uWNrZrb5YaVS7imtulNV0Efua3xwfVL6K74Rati3J eAr0xJ60QKcKCYz6+ywurfRQ7YJ8Pp5ZlQorFeZ3hRk6Lj22Poic1FSr48EebqPtHd/w F8kijtuVrAe0IRuSD3K8J9+98lF8lkOuDHd7YghIAwMktGjUpyM9LvaJOaO51gLZ7HeS wHWw== 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 r13-20020aa7da0d000000b0048ba605a150si2418372eds.240.2022.12.31.03.27.09; Sat, 31 Dec 2022 03:27:33 -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 S229536AbiLaLHe (ORCPT + 99 others); Sat, 31 Dec 2022 06:07:34 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45996 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231958AbiLaLHb (ORCPT ); Sat, 31 Dec 2022 06:07:31 -0500 Received: from smtp.smtpout.orange.fr (smtp-30.smtpout.orange.fr [80.12.242.30]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B4AA2DF55 for ; Sat, 31 Dec 2022 03:07:30 -0800 (PST) Received: from pop-os.home ([86.243.100.34]) by smtp.orange.fr with ESMTPA id BZi4pTIC3Rn9tBZi4pP7i0; Sat, 31 Dec 2022 12:07:29 +0100 X-ME-Helo: pop-os.home X-ME-Auth: Y2hyaXN0b3BoZS5qYWlsbGV0QHdhbmFkb28uZnI= X-ME-Date: Sat, 31 Dec 2022 12:07:29 +0100 X-ME-IP: 86.243.100.34 From: Christophe JAILLET To: Wim Van Sebroeck , Guenter Roeck Cc: linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, Christophe JAILLET , linux-watchdog@vger.kernel.org Subject: [PATCH] watchdog: ixp4xx: Use devm_clk_get_enabled() helper Date: Sat, 31 Dec 2022 12:07:27 +0100 Message-Id: <5d04e453a4da5cfafb56695a17157fa3ea296511.1672484831.git.christophe.jaillet@wanadoo.fr> 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_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_PASS autolearn=ham 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?1753728735731088159?= X-GMAIL-MSGID: =?utf-8?q?1753728735731088159?= 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 I get a compilation error because read_cpuid_id() is not defined on my system (x86_64). So I think that a "depends on ARM" in missing in a KConfig file. Fixing it could help compilation farms build-bots. --- drivers/watchdog/ixp4xx_wdt.c | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/drivers/watchdog/ixp4xx_wdt.c b/drivers/watchdog/ixp4xx_wdt.c index 281a48d9889f..607ce4b8df57 100644 --- a/drivers/watchdog/ixp4xx_wdt.c +++ b/drivers/watchdog/ixp4xx_wdt.c @@ -112,12 +112,6 @@ static const struct watchdog_info ixp4xx_wdt_info = { .identity = KBUILD_MODNAME, }; -/* Devres-handled clock disablement */ -static void ixp4xx_clock_action(void *d) -{ - clk_disable_unprepare(d); -} - static int ixp4xx_wdt_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; @@ -139,16 +133,10 @@ static int ixp4xx_wdt_probe(struct platform_device *pdev) * Retrieve rate from a fixed clock from the device tree if * the parent has that, else use the default clock rate. */ - clk = devm_clk_get(dev->parent, NULL); - if (!IS_ERR(clk)) { - ret = clk_prepare_enable(clk); - if (ret) - return ret; - ret = devm_add_action_or_reset(dev, ixp4xx_clock_action, clk); - if (ret) - return ret; + clk = devm_clk_get_enabled(dev->parent, NULL); + if (!IS_ERR(clk)) iwdt->rate = clk_get_rate(clk); - } + if (!iwdt->rate) iwdt->rate = IXP4XX_TIMER_FREQ;