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>,
Matthias Brugger <matthias.bgg@gmail.com>,
linux-arm-kernel@lists.infradead.org,
linux-mediatek@lists.infradead.org
Subject: [PATCH 3/8] watchdog: mtk_wdt: Remove #ifdef guards for PM related functions
Date: Tue, 28 Jun 2022 20:34:44 +0100 [thread overview]
Message-ID: <20220628193449.160585-4-paul@crapouillou.net> (raw)
In-Reply-To: <20220628193449.160585-1-paul@crapouillou.net>
Use the new DEFINE_SIMPLE_DEV_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>
Cc: Matthias Brugger <matthias.bgg@gmail.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-mediatek@lists.infradead.org
---
drivers/watchdog/mtk_wdt.c | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/drivers/watchdog/mtk_wdt.c b/drivers/watchdog/mtk_wdt.c
index f0d4e3cc7459..e97787536792 100644
--- a/drivers/watchdog/mtk_wdt.c
+++ b/drivers/watchdog/mtk_wdt.c
@@ -401,7 +401,6 @@ static int mtk_wdt_probe(struct platform_device *pdev)
return 0;
}
-#ifdef CONFIG_PM_SLEEP
static int mtk_wdt_suspend(struct device *dev)
{
struct mtk_wdt_dev *mtk_wdt = dev_get_drvdata(dev);
@@ -423,7 +422,6 @@ static int mtk_wdt_resume(struct device *dev)
return 0;
}
-#endif
static const struct of_device_id mtk_wdt_dt_ids[] = {
{ .compatible = "mediatek,mt2712-wdt", .data = &mt2712_data },
@@ -437,16 +435,14 @@ static const struct of_device_id mtk_wdt_dt_ids[] = {
};
MODULE_DEVICE_TABLE(of, mtk_wdt_dt_ids);
-static const struct dev_pm_ops mtk_wdt_pm_ops = {
- SET_SYSTEM_SLEEP_PM_OPS(mtk_wdt_suspend,
- mtk_wdt_resume)
-};
+static DEFINE_SIMPLE_DEV_PM_OPS(mtk_wdt_pm_ops,
+ mtk_wdt_suspend, mtk_wdt_resume);
static struct platform_driver mtk_wdt_driver = {
.probe = mtk_wdt_probe,
.driver = {
.name = DRV_NAME,
- .pm = &mtk_wdt_pm_ops,
+ .pm = pm_sleep_ptr(&mtk_wdt_pm_ops),
.of_match_table = mtk_wdt_dt_ids,
},
};
--
2.35.1
next prev parent reply other threads:[~2022-06-28 19:43 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 ` Paul Cercueil [this message]
2022-06-28 20:02 ` [PATCH 3/8] watchdog: mtk_wdt: " 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 ` [PATCH 8/8] watchdog: wdat_wdt: " Paul Cercueil
2022-06-28 20:09 ` 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-4-paul@crapouillou.net \
--to=paul@crapouillou.net \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=matthias.bgg@gmail.com \
--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®