From patchwork Sat Dec 31 08:12:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe JAILLET X-Patchwork-Id: 37814 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp3250614wrt; Sat, 31 Dec 2022 00:22:37 -0800 (PST) X-Google-Smtp-Source: AMrXdXt9N+bLePV+nY+ND54D5t5yiP2ThsLcoC3PlnCxwmMECDLU5isaCvyRKZFglm93doRn4B83 X-Received: by 2002:a17:902:da83:b0:189:8425:730d with SMTP id j3-20020a170902da8300b001898425730dmr52009930plx.27.1672474956926; Sat, 31 Dec 2022 00:22:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672474956; cv=none; d=google.com; s=arc-20160816; b=ZSmkJ2g3jfBLLvIfb2hWxtIL+54bxQfUk9yorcUXbrDhQRKDRIOG08qhB3VJvAev59 upCNYG9tfLHMCzFUKbklcNHG4tslS25yr+33BkzKzf3mGyY3vcHCdFkoaRPSMF2l0JCT VoQ4yV4kMGGBJBM+uLMTmC3Cq/ihxS4Q/u+GIX38nk9zqPH+dWCGikFU3x0hP31NQDN0 wwMAnHjPgHrYiOPx+aHRnCjoSpigeoKumjPBeN737SHfsfhO+gDctoTToKBqg6IK2cRp 8tQbkpuCnz6fiIF0sMYG3pYo22iUo7tbisIdDfR65DcTN5NMYfw/wUIekjzDimwxaeW8 KafA== 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=fPKLepEZjwHoVHm8gQ1bgqcpNDBI+YK9/7MuPOzR3YA=; b=1ANAosDmEpx5GLEgmHGgpD1Z3dGM8ZY+6W/VNIz8F3V312T3yqMuVpVAl8uW5eRy7b 9Hq1MCKPzNCvZYYBo0nE8dM7oeZZPDA9IxL0bL8ojwt2k0me0X+KpP6wyPwuGuykrwOA +Mm7PDUNcdYLg5gxzdfBRnyyhS2d2+sd10aFQtt09tcVgqNtXxc0/e4m0fNDymvPWr4H oPU11W0WMiIJ7MxLKkk6J6LF8iVGBAFBQz3OmBchzNyQoZsmft00UsjazhjXiEqCjCK3 xjhR28uYMmpmI9atXB7jW0BYBaTUqMu2fEV8uxhsjk9Kzq+Faz4t9vf1kz/yA+/vET67 mGDw== 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 e21-20020a637455000000b00478fd9b70c9si25773825pgn.520.2022.12.31.00.22.07; Sat, 31 Dec 2022 00:22:36 -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 S229546AbiLaIMf (ORCPT + 99 others); Sat, 31 Dec 2022 03:12:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47102 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230117AbiLaIMc (ORCPT ); Sat, 31 Dec 2022 03:12:32 -0500 Received: from smtp.smtpout.orange.fr (smtp-15.smtpout.orange.fr [80.12.242.15]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9FB00C75E for ; Sat, 31 Dec 2022 00:12:31 -0800 (PST) Received: from pop-os.home ([86.243.100.34]) by smtp.orange.fr with ESMTPA id BWyjpGbkfBicGBWyjpKZZ0; Sat, 31 Dec 2022 09:12:30 +0100 X-ME-Helo: pop-os.home X-ME-Auth: Y2hyaXN0b3BoZS5qYWlsbGV0QHdhbmFkb28uZnI= X-ME-Date: Sat, 31 Dec 2022 09:12:30 +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: cadence: Use devm_clk_get_enabled() helper Date: Sat, 31 Dec 2022 09:12:28 +0100 Message-Id: <615c6c3c46c3ee8e3136725af0ab0b51e1298091.1672474336.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?1753717100560500867?= X-GMAIL-MSGID: =?utf-8?q?1753717100560500867?= 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 --- drivers/watchdog/cadence_wdt.c | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/drivers/watchdog/cadence_wdt.c b/drivers/watchdog/cadence_wdt.c index bc99e9164930..23d41043863f 100644 --- a/drivers/watchdog/cadence_wdt.c +++ b/drivers/watchdog/cadence_wdt.c @@ -274,11 +274,6 @@ static const struct watchdog_ops cdns_wdt_ops = { .set_timeout = cdns_wdt_settimeout, }; -static void cdns_clk_disable_unprepare(void *data) -{ - clk_disable_unprepare(data); -} - /************************Platform Operations*****************************/ /** * cdns_wdt_probe - Probe call for the device. @@ -333,21 +328,11 @@ static int cdns_wdt_probe(struct platform_device *pdev) watchdog_stop_on_reboot(cdns_wdt_device); watchdog_set_drvdata(cdns_wdt_device, wdt); - wdt->clk = devm_clk_get(dev, NULL); + wdt->clk = devm_clk_get_enabled(dev, NULL); if (IS_ERR(wdt->clk)) return dev_err_probe(dev, PTR_ERR(wdt->clk), "input clock not found\n"); - ret = clk_prepare_enable(wdt->clk); - if (ret) { - dev_err(dev, "unable to enable clock\n"); - return ret; - } - ret = devm_add_action_or_reset(dev, cdns_clk_disable_unprepare, - wdt->clk); - if (ret) - return ret; - clock_f = clk_get_rate(wdt->clk); if (clock_f <= CDNS_WDT_CLK_75MHZ) { wdt->prescaler = CDNS_WDT_PRESCALE_512;