From: Fabio Estevam <festevam@gmail.com>
To: linux@roeck-us.net
Cc: wim@linux-watchdog.org, linux-watchdog@vger.kernel.org,
Fabio Estevam <festevam@denx.de>
Subject: [PATCH 2/2] watchdog: imx_sc_wdt: Remove __maybe_unused notations
Date: Thu, 8 Aug 2024 23:08:22 -0300 [thread overview]
Message-ID: <20240809020822.335682-2-festevam@gmail.com> (raw)
In-Reply-To: <20240809020822.335682-1-festevam@gmail.com>
From: Fabio Estevam <festevam@denx.de>
Use the 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 __maybe_unused notation.
Signed-off-by: Fabio Estevam <festevam@denx.de>
---
drivers/watchdog/imx_sc_wdt.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/watchdog/imx_sc_wdt.c b/drivers/watchdog/imx_sc_wdt.c
index e51fe1b78518..efd492b122f4 100644
--- a/drivers/watchdog/imx_sc_wdt.c
+++ b/drivers/watchdog/imx_sc_wdt.c
@@ -216,7 +216,7 @@ static int imx_sc_wdt_probe(struct platform_device *pdev)
return devm_watchdog_register_device(dev, wdog);
}
-static int __maybe_unused imx_sc_wdt_suspend(struct device *dev)
+static int imx_sc_wdt_suspend(struct device *dev)
{
struct imx_sc_wdt_device *imx_sc_wdd = dev_get_drvdata(dev);
@@ -226,7 +226,7 @@ static int __maybe_unused imx_sc_wdt_suspend(struct device *dev)
return 0;
}
-static int __maybe_unused imx_sc_wdt_resume(struct device *dev)
+static int imx_sc_wdt_resume(struct device *dev)
{
struct imx_sc_wdt_device *imx_sc_wdd = dev_get_drvdata(dev);
@@ -236,8 +236,8 @@ static int __maybe_unused imx_sc_wdt_resume(struct device *dev)
return 0;
}
-static SIMPLE_DEV_PM_OPS(imx_sc_wdt_pm_ops,
- imx_sc_wdt_suspend, imx_sc_wdt_resume);
+static DEFINE_SIMPLE_DEV_PM_OPS(imx_sc_wdt_pm_ops, imx_sc_wdt_suspend,
+ imx_sc_wdt_resume);
static const struct of_device_id imx_sc_wdt_dt_ids[] = {
{ .compatible = "fsl,imx-sc-wdt", },
@@ -250,7 +250,7 @@ static struct platform_driver imx_sc_wdt_driver = {
.driver = {
.name = "imx-sc-wdt",
.of_match_table = imx_sc_wdt_dt_ids,
- .pm = &imx_sc_wdt_pm_ops,
+ .pm = pm_sleep_ptr(&imx_sc_wdt_pm_ops),
},
};
module_platform_driver(imx_sc_wdt_driver);
--
2.34.1
next prev parent reply other threads:[~2024-08-09 2:08 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-09 2:08 [PATCH 1/2] watchdog: imx2_wdt: Remove __maybe_unused notations Fabio Estevam
2024-08-09 2:08 ` Fabio Estevam [this message]
2024-08-09 3:15 ` [PATCH 2/2] watchdog: imx_sc_wdt: " Guenter Roeck
2024-08-09 3:15 ` [PATCH 1/2] watchdog: imx2_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=20240809020822.335682-2-festevam@gmail.com \
--to=festevam@gmail.com \
--cc=festevam@denx.de \
--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