From: Claudiu <claudiu.beznea@tuxon.dev>
To: wim@linux-watchdog.org, linux@roeck-us.net, robh@kernel.org,
krzk+dt@kernel.org, conor+dt@kernel.org, p.zabel@pengutronix.de,
geert+renesas@glider.be, magnus.damm@gmail.com,
biju.das.jz@bp.renesas.com
Cc: linux-watchdog@vger.kernel.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-renesas-soc@vger.kernel.org,
claudiu.beznea@tuxon.dev,
Claudiu Beznea <claudiu.beznea.uj@bp.renesas.com>
Subject: [PATCH RESEND v8 03/10] watchdog: rzg2l_wdt: Use pm_runtime_resume_and_get()
Date: Wed, 10 Apr 2024 16:40:37 +0300 [thread overview]
Message-ID: <20240410134044.2138310-4-claudiu.beznea.uj@bp.renesas.com> (raw)
In-Reply-To: <20240410134044.2138310-1-claudiu.beznea.uj@bp.renesas.com>
From: Claudiu Beznea <claudiu.beznea.uj@bp.renesas.com>
pm_runtime_get_sync() may return with error. In case it returns with error
dev->power.usage_count needs to be decremented. pm_runtime_resume_and_get()
takes care of this. Thus use it.
Along with it the rzg2l_wdt_set_timeout() function was updated to
propagate the result of rzg2l_wdt_start() to its caller.
Fixes: 2cbc5cd0b55f ("watchdog: Add Watchdog Timer driver for RZ/G2L")
Signed-off-by: Claudiu Beznea <claudiu.beznea.uj@bp.renesas.com>
---
Changes in v8:
- none
Changes in v7:
- none
Changes in v6:
- none
Changes in v5:
- none
Changes in v4:
- none
Changes in v3:
- none
Changes in v2:
- propagate the return code of rzg2l_wdt_start() to it's callers
drivers/watchdog/rzg2l_wdt.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/drivers/watchdog/rzg2l_wdt.c b/drivers/watchdog/rzg2l_wdt.c
index 1741f98ca67c..d87d4f50180c 100644
--- a/drivers/watchdog/rzg2l_wdt.c
+++ b/drivers/watchdog/rzg2l_wdt.c
@@ -123,8 +123,11 @@ static void rzg2l_wdt_init_timeout(struct watchdog_device *wdev)
static int rzg2l_wdt_start(struct watchdog_device *wdev)
{
struct rzg2l_wdt_priv *priv = watchdog_get_drvdata(wdev);
+ int ret;
- pm_runtime_get_sync(wdev->parent);
+ ret = pm_runtime_resume_and_get(wdev->parent);
+ if (ret)
+ return ret;
/* Initialize time out */
rzg2l_wdt_init_timeout(wdev);
@@ -150,6 +153,8 @@ static int rzg2l_wdt_stop(struct watchdog_device *wdev)
static int rzg2l_wdt_set_timeout(struct watchdog_device *wdev, unsigned int timeout)
{
+ int ret = 0;
+
wdev->timeout = timeout;
/*
@@ -159,10 +164,10 @@ static int rzg2l_wdt_set_timeout(struct watchdog_device *wdev, unsigned int time
*/
if (watchdog_active(wdev)) {
rzg2l_wdt_stop(wdev);
- rzg2l_wdt_start(wdev);
+ ret = rzg2l_wdt_start(wdev);
}
- return 0;
+ return ret;
}
static int rzg2l_wdt_restart(struct watchdog_device *wdev,
--
2.39.2
next prev parent reply other threads:[~2024-04-10 13:41 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-10 13:40 [PATCH RESEND v8 00/10] watchdog: rzg2l_wdt: Add support for RZ/G3S Claudiu
2024-04-10 13:40 ` [PATCH RESEND v8 01/10] watchdog: rzg2l_wdt: Restrict the driver to ARCH_RZG2L and ARCH_R9A09G011 Claudiu
2024-04-10 16:38 ` Guenter Roeck
2024-04-10 13:40 ` [PATCH RESEND v8 02/10] watchdog: rzg2l_wdt: Make the driver depend on PM Claudiu
2024-04-10 16:39 ` Guenter Roeck
2024-04-10 13:40 ` Claudiu [this message]
2024-04-10 13:51 ` [PATCH RESEND v8 03/10] watchdog: rzg2l_wdt: Use pm_runtime_resume_and_get() Biju Das
2024-04-10 14:01 ` claudiu beznea
2024-04-10 14:05 ` Biju Das
2024-04-10 14:13 ` Biju Das
2024-04-10 14:48 ` claudiu beznea
2024-04-10 14:54 ` Biju Das
2024-04-10 16:39 ` Guenter Roeck
2024-04-10 13:40 ` [PATCH RESEND v8 04/10] watchdog: rzg2l_wdt: Check return status of pm_runtime_put() Claudiu
2024-04-10 16:41 ` Guenter Roeck
2024-04-11 14:07 ` claudiu beznea
2024-04-10 13:40 ` [PATCH RESEND v8 05/10] watchdog: rzg2l_wdt: Remove reset de-assert from probe Claudiu
2024-04-10 16:41 ` Guenter Roeck
2024-04-10 13:40 ` [PATCH RESEND v8 06/10] watchdog: rzg2l_wdt: Remove comparison with zero Claudiu
2024-04-10 16:41 ` Guenter Roeck
2024-04-10 13:40 ` [PATCH RESEND v8 07/10] watchdog: rzg2l_wdt: Rely on the reset driver for doing proper reset Claudiu
2024-04-10 16:42 ` Guenter Roeck
2024-04-10 13:40 ` [PATCH RESEND v8 08/10] watchdog: rzg2l_wdt: Add suspend/resume support Claudiu
2024-04-10 16:42 ` Guenter Roeck
2024-04-10 13:40 ` [PATCH RESEND v8 09/10] watchdog: rzg2l_wdt: Power on the PM domain in rzg2l_wdt_restart() Claudiu
2024-04-10 16:43 ` Guenter Roeck
2024-04-11 15:20 ` Geert Uytterhoeven
2024-04-12 11:14 ` Ulf Hansson
2024-04-12 14:02 ` claudiu beznea
2024-04-24 11:14 ` claudiu beznea
2024-04-29 14:19 ` Ulf Hansson
2024-05-20 11:55 ` claudiu beznea
2024-04-12 11:18 ` Ulf Hansson
2024-04-10 13:40 ` [PATCH RESEND v8 10/10] dt-bindings: watchdog: renesas,wdt: Document RZ/G3S support Claudiu
2024-04-10 16:43 ` Guenter Roeck
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240410134044.2138310-4-claudiu.beznea.uj@bp.renesas.com \
--to=claudiu.beznea@tuxon.dev \
--cc=biju.das.jz@bp.renesas.com \
--cc=claudiu.beznea.uj@bp.renesas.com \
--cc=conor+dt@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=geert+renesas@glider.be \
--cc=krzk+dt@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=magnus.damm@gmail.com \
--cc=p.zabel@pengutronix.de \
--cc=robh@kernel.org \
--cc=wim@linux-watchdog.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).