From patchwork Sat Dec 31 10:53:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe JAILLET X-Patchwork-Id: 37832 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp3290438wrt; Sat, 31 Dec 2022 02:55:33 -0800 (PST) X-Google-Smtp-Source: AMrXdXvx8FCWZia26Z8DnT1iRvrQRnd4kBGg9PowBU5vt0wUrMRRUXS1q8VluhDiLXroviZsHko7 X-Received: by 2002:a05:6402:2072:b0:487:6d4a:444c with SMTP id bd18-20020a056402207200b004876d4a444cmr11757350edb.28.1672484133743; Sat, 31 Dec 2022 02:55:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672484133; cv=none; d=google.com; s=arc-20160816; b=BnGOl90Ap++8BkKnZJ1h9jgUQfZUCBE+39PcNwLV85IWJs9JAPKH27qnd4a9se0bS8 IpQ+F+40txa7W/Z2QN1tvpcQRpRPveqxEMy7DSWekHan+b3NdEa7o9kWSH0ru36rc2jZ L9KLxn7Nu8w1hwpw9KnpBZfXGcCcfZQWeryAd//stiTXIDPYALQHQi9dmooxfy0mcM7Y iHddObyQwI/LyqAqW8lmfIQCBI2/PNfXNDStAy8pV3xF9VIy/om9vZwWwpeg33sUROPR ypTj8+DIQuUMn71lvk5hwxXfZAtxYy+I/rz27mKrb7w48+iyDZR3TWeQ8lbnN9YCu8VU sZ3g== 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=PLaMki9bmZgbUn5FpBKMLLFqPYuu7MvIERcpquJIH5A=; b=UQR2m65+V+Ik/jum1YB5p5mLsB5VI4hidxP+ZDk409PMzjX1M72T565Rnngxy36nbE dBPDXz97w/7/el/lpgWhSVbnMybNvel3Kz3Oi/vhFR7C+LUQ+04/kdTXLdPZurFXwLa0 3FKcx+vz/ZEPII5tEXd0NSwS+d4ZcX1A09VkJTqdC8NLMA+tt7SfPgj/b9FUAvKErBWG orxJtuIGPklAZZ5HwoziCUY9FCrwSxA7JoDHTLRNm1BrSHklOCguPuia+vUC/WPgqgN2 WCZwJdzTWbEcKx+YHJ9gWGMyZD1HNJvrhy3MWamU2oHMyLu5Ce9EeAr5CN2AwwVa3mOC CtHA== 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 l16-20020a056402255000b0047010e04c4dsi22645249edb.481.2022.12.31.02.55.09; Sat, 31 Dec 2022 02:55: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 S230138AbiLaKxy (ORCPT + 99 others); Sat, 31 Dec 2022 05:53:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43030 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231341AbiLaKxj (ORCPT ); Sat, 31 Dec 2022 05:53:39 -0500 Received: from smtp.smtpout.orange.fr (smtp-23.smtpout.orange.fr [80.12.242.23]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7130230C for ; Sat, 31 Dec 2022 02:53:37 -0800 (PST) Received: from pop-os.home ([86.243.100.34]) by smtp.orange.fr with ESMTPA id BZUdpDj8SPNsNBZUdp5ZNY; Sat, 31 Dec 2022 11:53:35 +0100 X-ME-Helo: pop-os.home X-ME-Auth: Y2hyaXN0b3BoZS5qYWlsbGV0QHdhbmFkb28uZnI= X-ME-Date: Sat, 31 Dec 2022 11:53:35 +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: imgpdc: Use devm_clk_get_enabled() helper Date: Sat, 31 Dec 2022 11:53:34 +0100 Message-Id: <1f8d1ce1e6a63c507a291aea624b1337326cc563.1672483996.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_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?1753726722772041820?= X-GMAIL-MSGID: =?utf-8?q?1753726722772041820?= 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 "sys" clk is now prepare_enable()'ed before clk_get("wdt"). --- drivers/watchdog/imgpdc_wdt.c | 31 +++---------------------------- 1 file changed, 3 insertions(+), 28 deletions(-) diff --git a/drivers/watchdog/imgpdc_wdt.c b/drivers/watchdog/imgpdc_wdt.c index b57ff3787052..a55f801895d4 100644 --- a/drivers/watchdog/imgpdc_wdt.c +++ b/drivers/watchdog/imgpdc_wdt.c @@ -175,16 +175,11 @@ static const struct watchdog_ops pdc_wdt_ops = { .restart = pdc_wdt_restart, }; -static void pdc_clk_disable_unprepare(void *data) -{ - clk_disable_unprepare(data); -} - static int pdc_wdt_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; u64 div; - int ret, val; + int val; unsigned long clk_rate; struct pdc_wdt_dev *pdc_wdt; @@ -196,38 +191,18 @@ static int pdc_wdt_probe(struct platform_device *pdev) if (IS_ERR(pdc_wdt->base)) return PTR_ERR(pdc_wdt->base); - pdc_wdt->sys_clk = devm_clk_get(dev, "sys"); + pdc_wdt->sys_clk = devm_clk_get_enabled(dev, "sys"); if (IS_ERR(pdc_wdt->sys_clk)) { dev_err(dev, "failed to get the sys clock\n"); return PTR_ERR(pdc_wdt->sys_clk); } - pdc_wdt->wdt_clk = devm_clk_get(dev, "wdt"); + pdc_wdt->wdt_clk = devm_clk_get_enabled(dev, "wdt"); if (IS_ERR(pdc_wdt->wdt_clk)) { dev_err(dev, "failed to get the wdt clock\n"); return PTR_ERR(pdc_wdt->wdt_clk); } - ret = clk_prepare_enable(pdc_wdt->sys_clk); - if (ret) { - dev_err(dev, "could not prepare or enable sys clock\n"); - return ret; - } - ret = devm_add_action_or_reset(dev, pdc_clk_disable_unprepare, - pdc_wdt->sys_clk); - if (ret) - return ret; - - ret = clk_prepare_enable(pdc_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, pdc_clk_disable_unprepare, - pdc_wdt->wdt_clk); - if (ret) - return ret; - /* We use the clock rate to calculate the max timeout */ clk_rate = clk_get_rate(pdc_wdt->wdt_clk); if (clk_rate == 0) {