From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1793212376; b=N0z5SJaAc/uCViTKCfEbmBHzHYJb9ANL++2lRM8JBZumB5iZXWSpElwW6GWPx9asdQiW E+ZPYB4+/ouprBQ12Gjl7gtJUS4IVpKlXDwz96ALL0ZJonGsGDuJ7TC//oCQYp9KpMsrs V5+TV+dWoOzkYzSnc7U3QWGpYTsgDKTM7C/9NNiaHzgUwC7x/RTbDeVZ4R72LBut1WcbE jbJonkQggIIsBju7BElk0ZI6NeIx+hZRMTeBev6fz5ozG7JPzQJMCWRoYRHwR4oLM/OlL 2+INnZg82pjYoXrXLhZ3KLvoDNO4Yl5hyUsWlMONGvM1Nx0rAG2FYBcWussK/nK+lHw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793212376; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=MANo8oGOp1qKF1Y62w4RMm+nUSq1KTdo0zAymwcJ54k=; b=Vh+1UaAY+rE6BkL1LRbHV5mndQ+yy2Qdm4LBnvEr7v9j4vPEEz7Y4Am/IWjk9srZARYG XlHsscXTIXdOm922fGU6n67aW1TBHCV574N5BVKcJLwQjWW+aczu+oTK4S6Ov0YhPMJtW v3l0pu2aLxUi8Cj00AMjOtWi9FwGxLx0IXJjRjPzIeZLqDQfgjCopQmO6lU+FRQPPAdJe kpzU2flLcEZg6aJKf3DlRYtvwiUGwMYqCn8o2nrwrFQEag2qC9ObuIptJfRUqSv6lcdxu +OMJMjLKMsro7J3jbG6s7kX9fhADrnSRvOXcWEr2JmcpYjvxGjn9hEv4NCAzUtJlftA== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b="Aue/YR4/"; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 64D66606A31D; Wed, 28 Oct 2026 18:32:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key, unprotected) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=Aue/YR4/ Received: by smtp.kernel.org (Postfix) with ESMTPSA id B59D11F01825; Wed, 28 Oct 2026 18:32:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1793212376; bh=MANo8oGOp1qKF1Y62w4RMm+nUSq1KTdo0zAymwcJ54k=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Aue/YR4/0mSwsWbbdUDrfIzd5nDAeRqEIq5fk4NKm3W6MexVJ6MACzKkFH42Ss6ju ZYawsZ4D6rzSNFcr9frGd+Fwpzuzj+4j/fHsvBYdLCd/blFB2fEY1dVQfL3aRwuHmK Q2vo9FbXCBbqtUSdcki+2/kVHpcXnToitEJtkYwM= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Christophe JAILLET , Guenter Roeck , Wim Van Sebroeck , Sasha Levin Subject: [PATCH 6.1 0132/1887] watchdog: rtd119x: Use devm_clk_get_enabled() helper Date: Wed, 28 Oct 2026 17:37:08 +0100 Message-ID: <20261028170502.241464280@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261028170459.200466217@linuxfoundation.org> References: <20261028170459.200466217@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Christophe JAILLET [ Upstream commit 6cc0768ba6f5293a4435612164a2cfbf2edbd025 ] 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 Link: https://lore.kernel.org/r/14b521b821279bc5111dc80b55d0936c5767c737.1672418470.git.christophe.jaillet@wanadoo.fr Signed-off-by: Guenter Roeck Signed-off-by: Wim Van Sebroeck Stable-dep-of: 5af7d2cbd20f ("watchdog: rtd119x: Avoid division by zero") Signed-off-by: Sasha Levin --- drivers/watchdog/rtd119x_wdt.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/drivers/watchdog/rtd119x_wdt.c b/drivers/watchdog/rtd119x_wdt.c index 834b94ff3f903..95c8d7abce42e 100644 --- a/drivers/watchdog/rtd119x_wdt.c +++ b/drivers/watchdog/rtd119x_wdt.c @@ -94,16 +94,10 @@ static const struct of_device_id rtd119x_wdt_dt_ids[] = { { } }; -static void rtd119x_clk_disable_unprepare(void *data) -{ - clk_disable_unprepare(data); -} - static int rtd119x_wdt_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; struct rtd119x_watchdog_device *data; - int ret; data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL); if (!data) @@ -113,18 +107,10 @@ static int rtd119x_wdt_probe(struct platform_device *pdev) if (IS_ERR(data->base)) return PTR_ERR(data->base); - data->clk = devm_clk_get(dev, NULL); + data->clk = devm_clk_get_enabled(dev, NULL); if (IS_ERR(data->clk)) return PTR_ERR(data->clk); - ret = clk_prepare_enable(data->clk); - if (ret) - return ret; - ret = devm_add_action_or_reset(dev, rtd119x_clk_disable_unprepare, - data->clk); - if (ret) - return ret; - data->wdt_dev.info = &rtd119x_wdt_info; data->wdt_dev.ops = &rtd119x_wdt_ops; data->wdt_dev.timeout = 120; -- 2.53.0