mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Paul Cercueil <paul@crapouillou.net>
To: Wim Van Sebroeck <wim@linux-watchdog.org>,
	Guenter Roeck <linux@roeck-us.net>
Cc: linux-watchdog@vger.kernel.org, linux-kernel@vger.kernel.org,
	Paul Cercueil <paul@crapouillou.net>
Subject: [PATCH 8/8] watchdog: wdat_wdt: Remove #ifdef guards for PM related functions
Date: Tue, 28 Jun 2022 20:34:49 +0100	[thread overview]
Message-ID: <20220628193449.160585-9-paul@crapouillou.net> (raw)
In-Reply-To: <20220628193449.160585-1-paul@crapouillou.net>

Use the new NOIRQ_SYSTEM_SLEEP_PM_OPS() and pm_sleep_ptr() macros to
handle the .suspend/.resume callbacks.

These macros allow the suspend and resume functions to be automatically
dropped by the compiler when CONFIG_SUSPEND is disabled, without having
to use #ifdef guards. Not using #ifdef guards means that the code is
always compiled independently of any Kconfig option, and thanks to that
bugs and regressions are easier to catch.

Signed-off-by: Paul Cercueil <paul@crapouillou.net>
---
 drivers/watchdog/wdat_wdt.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/drivers/watchdog/wdat_wdt.c b/drivers/watchdog/wdat_wdt.c
index e6f95e99156d..aeadaa07c891 100644
--- a/drivers/watchdog/wdat_wdt.c
+++ b/drivers/watchdog/wdat_wdt.c
@@ -467,7 +467,6 @@ static int wdat_wdt_probe(struct platform_device *pdev)
 	return devm_watchdog_register_device(dev, &wdat->wdd);
 }
 
-#ifdef CONFIG_PM_SLEEP
 static int wdat_wdt_suspend_noirq(struct device *dev)
 {
 	struct wdat_wdt *wdat = dev_get_drvdata(dev);
@@ -528,18 +527,16 @@ static int wdat_wdt_resume_noirq(struct device *dev)
 
 	return wdat_wdt_start(&wdat->wdd);
 }
-#endif
 
 static const struct dev_pm_ops wdat_wdt_pm_ops = {
-	SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(wdat_wdt_suspend_noirq,
-				      wdat_wdt_resume_noirq)
+	NOIRQ_SYSTEM_SLEEP_PM_OPS(wdat_wdt_suspend_noirq, wdat_wdt_resume_noirq)
 };
 
 static struct platform_driver wdat_wdt_driver = {
 	.probe = wdat_wdt_probe,
 	.driver = {
 		.name = "wdat_wdt",
-		.pm = &wdat_wdt_pm_ops,
+		.pm = pm_sleep_ptr(&wdat_wdt_pm_ops),
 	},
 };
 
-- 
2.35.1


  parent reply	other threads:[~2022-06-28 19:44 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-06-28 19:34 [PATCH 0/8] watchdog: " Paul Cercueil
2022-06-28 19:34 ` [PATCH 1/8] watchdog: bcm7038_wdt: " Paul Cercueil
2022-06-28 20:02   ` Guenter Roeck
2022-06-28 20:09   ` Florian Fainelli
2022-06-28 19:34 ` [PATCH 2/8] watchdog: dw_wdt: " Paul Cercueil
2022-06-28 20:02   ` Guenter Roeck
2022-06-28 19:34 ` [PATCH 3/8] watchdog: mtk_wdt: " Paul Cercueil
2022-06-28 20:02   ` Guenter Roeck
2022-06-29  8:25   ` AngeloGioacchino Del Regno
2022-06-28 19:34 ` [PATCH 4/8] watchdog: s3c2410_wdt: " Paul Cercueil
2022-06-28 20:03   ` Guenter Roeck
2022-06-29  7:36   ` Krzysztof Kozlowski
2022-06-28 19:34 ` [PATCH 5/8] watchdog: sama5d4_wdt: " Paul Cercueil
2022-06-28 20:03   ` Guenter Roeck
2022-06-30  8:25   ` Claudiu.Beznea
2022-06-28 19:34 ` [PATCH 6/8] watchdog: st_lpc_wdt: " Paul Cercueil
2022-06-28 20:03   ` Guenter Roeck
2022-06-28 19:34 ` [PATCH 7/8] watchdog: tegra_wdt: " Paul Cercueil
2022-06-28 20:03   ` Guenter Roeck
2022-06-28 19:34 ` Paul Cercueil [this message]
2022-06-28 20:09   ` [PATCH 8/8] watchdog: wdat_wdt: " 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=20220628193449.160585-9-paul@crapouillou.net \
    --to=paul@crapouillou.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-watchdog@vger.kernel.org \
    --cc=linux@roeck-us.net \
    --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

all inboxes | Powered by JetHome®