From patchwork Sat Dec 31 15:02:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe JAILLET X-Patchwork-Id: 37875 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp3380702wrt; Sat, 31 Dec 2022 07:04:19 -0800 (PST) X-Google-Smtp-Source: AMrXdXvCu7ePjzO44vqp4Gkup2V34q36qbn+DFj7hHl/4WU2jS0a0AgJVRWE+7H+KH770mn6V3Ux X-Received: by 2002:a17:906:5786:b0:7c0:e535:13fc with SMTP id k6-20020a170906578600b007c0e53513fcmr40062944ejq.37.1672499059442; Sat, 31 Dec 2022 07:04:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672499059; cv=none; d=google.com; s=arc-20160816; b=Z3l7P7E/uSMogSosidVybcSrnh8bGvcdxtpsYyb24+tSBXYlpMbDlA+6F1abNEb6Pa Y0BQ8BEtJu1nPXw7EjmNpugwICvjHloonB5gaW0vdGq1t5+4jk/DpnV2Ka/4qeBJ/nJv LswiXQC0UdNKwFNuYnoGSJWEfGb9xmYz1a+LFM+OzRWcj8yU33I6tQmPCstrOnAzELRD CBDl4JKc09vnxIN2LLIb14ElRy6U2J0dUc2wY05+k9PJRjJdmHW06SewbL3kadXYVsoh k3KImBGdelA2WcJ4dr+YnwFyLU34IF7RRaaW9kgj3/vf9tVnp9x+VfFlLs+/gnhPtQ5B v+ow== 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=f71/8gsnKNPUTEhW4PbxKlwYTT9jpR+z4jQwtEz/q74=; b=SRUs59mz4nV9tJprcPvsIhPKrJzOGME2rxIaVi52feD5j6MLBmSsy2YLNiluI7czai 7gzg3xMOcxqIHvnamo+kwEbc+OgtttkRq/6YKfqriaTSC6b1cPZTpRnxrkxflMa7IHk1 PsxWXNSGhH2MToD+ubMWRS4BdoSnv3i/dZV/+Kiihc5aq7+fb2OF/esrnPZEs1VgHxl+ J8XUWR45pSdT+IExjzkv8sEzO8o9CYnoj6noiP8cyw3lgRghuQa6xHpXLEFg1kF8kGBR vytwXHXbfWYkhe8k28Hh5ibvsVgwLGNxs0GtOtQAlVoawq7bLKdyHy8R26QRpcEQTvej B3Vw== 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 xb10-20020a170907070a00b007c1052c9243si22262184ejb.15.2022.12.31.07.03.55; Sat, 31 Dec 2022 07:04:19 -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 S232003AbiLaPC0 (ORCPT + 99 others); Sat, 31 Dec 2022 10:02:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40026 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231610AbiLaPCZ (ORCPT ); Sat, 31 Dec 2022 10:02:25 -0500 Received: from smtp.smtpout.orange.fr (smtp-14.smtpout.orange.fr [80.12.242.14]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7859F636F for ; Sat, 31 Dec 2022 07:02:22 -0800 (PST) Received: from pop-os.home ([86.243.100.34]) by smtp.orange.fr with ESMTPA id BdNLpRaYpxN58BdNLp4Muy; Sat, 31 Dec 2022 16:02:20 +0100 X-ME-Helo: pop-os.home X-ME-Auth: Y2hyaXN0b3BoZS5qYWlsbGV0QHdhbmFkb28uZnI= X-ME-Date: Sat, 31 Dec 2022 16:02:20 +0100 X-ME-IP: 86.243.100.34 From: Christophe JAILLET To: Sander Vanheule , 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: realtek_otto: Use devm_clk_get_enabled() helper Date: Sat, 31 Dec 2022 16:02:17 +0100 Message-Id: <5e4255782fbb43d1b4b5cd03bd12d7a184497134.1672498920.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?1753742373776451863?= X-GMAIL-MSGID: =?utf-8?q?1753742373776451863?= 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 Acked-by: Sander Vanheule Reviewed-by: Guenter Roeck --- drivers/watchdog/realtek_otto_wdt.c | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/drivers/watchdog/realtek_otto_wdt.c b/drivers/watchdog/realtek_otto_wdt.c index 2a5298c5e8e4..2c30ddd574c5 100644 --- a/drivers/watchdog/realtek_otto_wdt.c +++ b/drivers/watchdog/realtek_otto_wdt.c @@ -235,27 +235,14 @@ static const struct watchdog_info otto_wdt_info = { WDIOF_PRETIMEOUT, }; -static void otto_wdt_clock_action(void *data) -{ - clk_disable_unprepare(data); -} - static int otto_wdt_probe_clk(struct otto_wdt_ctrl *ctrl) { - struct clk *clk = devm_clk_get(ctrl->dev, NULL); - int ret; + struct clk *clk; + clk = devm_clk_get_enabled(ctrl->dev, NULL); if (IS_ERR(clk)) return dev_err_probe(ctrl->dev, PTR_ERR(clk), "Failed to get clock\n"); - ret = clk_prepare_enable(clk); - if (ret) - return dev_err_probe(ctrl->dev, ret, "Failed to enable clock\n"); - - ret = devm_add_action_or_reset(ctrl->dev, otto_wdt_clock_action, clk); - if (ret) - return ret; - ctrl->clk_rate_khz = clk_get_rate(clk) / 1000; if (ctrl->clk_rate_khz == 0) return dev_err_probe(ctrl->dev, -ENXIO, "Failed to get clock rate\n");