From: Paul Cercueil <paul@crapouillou.net>
To: Lee Jones <lee@kernel.org>
Cc: linux-kernel@vger.kernel.org,
Paul Cercueil <paul@crapouillou.net>,
Maxime Coquelin <mcoquelin.stm32@gmail.com>,
Alexandre Torgue <alexandre.torgue@foss.st.com>,
linux-stm32@st-md-mailman.stormreply.com,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH v3 25/28] mfd: stmpe: Remove #ifdef guards for PM related functions
Date: Sun, 23 Oct 2022 10:48:49 +0100 [thread overview]
Message-ID: <20221023094852.8035-26-paul@crapouillou.net> (raw)
In-Reply-To: <20221023094852.8035-1-paul@crapouillou.net>
Use the new EXPORT_GPL_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.
This has the advantage of always compiling these functions in,
independently of any Kconfig option. Thanks to that, bugs and other
regressions are subsequently easier to catch.
Signed-off-by: Paul Cercueil <paul@crapouillou.net>
---
V2: remove duplicated "const".
Cc: Maxime Coquelin <mcoquelin.stm32@gmail.com>
Cc: Alexandre Torgue <alexandre.torgue@foss.st.com>
Cc: linux-stm32@st-md-mailman.stormreply.com
Cc: linux-arm-kernel@lists.infradead.org
drivers/mfd/stmpe-i2c.c | 4 +---
drivers/mfd/stmpe-spi.c | 4 +---
drivers/mfd/stmpe.c | 8 ++------
3 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/drivers/mfd/stmpe-i2c.c b/drivers/mfd/stmpe-i2c.c
index d3eedf3d607e..bf094cc9f9de 100644
--- a/drivers/mfd/stmpe-i2c.c
+++ b/drivers/mfd/stmpe-i2c.c
@@ -116,9 +116,7 @@ MODULE_DEVICE_TABLE(i2c, stmpe_i2c_id);
static struct i2c_driver stmpe_i2c_driver = {
.driver = {
.name = "stmpe-i2c",
-#ifdef CONFIG_PM
- .pm = &stmpe_dev_pm_ops,
-#endif
+ .pm = pm_sleep_ptr(&stmpe_dev_pm_ops),
.of_match_table = stmpe_of_match,
},
.probe = stmpe_i2c_probe,
diff --git a/drivers/mfd/stmpe-spi.c b/drivers/mfd/stmpe-spi.c
index ad8055a0e286..e9cbf33502b3 100644
--- a/drivers/mfd/stmpe-spi.c
+++ b/drivers/mfd/stmpe-spi.c
@@ -135,9 +135,7 @@ static struct spi_driver stmpe_spi_driver = {
.driver = {
.name = "stmpe-spi",
.of_match_table = of_match_ptr(stmpe_spi_of_match),
-#ifdef CONFIG_PM
- .pm = &stmpe_dev_pm_ops,
-#endif
+ .pm = pm_sleep_ptr(&stmpe_dev_pm_ops),
},
.probe = stmpe_spi_probe,
.remove = stmpe_spi_remove,
diff --git a/drivers/mfd/stmpe.c b/drivers/mfd/stmpe.c
index 0c4f74197d3e..c304d20bb988 100644
--- a/drivers/mfd/stmpe.c
+++ b/drivers/mfd/stmpe.c
@@ -1495,7 +1495,6 @@ void stmpe_remove(struct stmpe *stmpe)
mfd_remove_devices(stmpe->dev);
}
-#ifdef CONFIG_PM
static int stmpe_suspend(struct device *dev)
{
struct stmpe *stmpe = dev_get_drvdata(dev);
@@ -1516,8 +1515,5 @@ static int stmpe_resume(struct device *dev)
return 0;
}
-const struct dev_pm_ops stmpe_dev_pm_ops = {
- .suspend = stmpe_suspend,
- .resume = stmpe_resume,
-};
-#endif
+EXPORT_GPL_SIMPLE_DEV_PM_OPS(stmpe_dev_pm_ops,
+ stmpe_suspend, stmpe_resume);
--
2.35.1
next prev parent reply other threads:[~2022-10-23 9:55 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-23 9:48 [PATCH v3 00/28] mfd: Remove #ifdef guards for PM functions Paul Cercueil
2022-10-23 9:48 ` [PATCH v3 01/28] mfd: 88pm80x: Remove #ifdef guards for PM related functions Paul Cercueil
2022-10-23 9:48 ` [PATCH v3 02/28] mfd: aat2870: " Paul Cercueil
2022-10-23 9:48 ` [PATCH v3 03/28] mfd: adp5520: " Paul Cercueil
2022-10-23 9:48 ` [PATCH v3 04/28] mfd: max8925-i2c: " Paul Cercueil
2022-10-23 9:48 ` [PATCH v3 05/28] mfd: mt6397-irq: " Paul Cercueil
2022-10-23 9:48 ` [PATCH v3 06/28] mfd: pcf50633: " Paul Cercueil
2022-10-23 9:48 ` [PATCH v3 07/28] mfd: rc5t583-irq: " Paul Cercueil
2022-10-23 9:48 ` [PATCH v3 08/28] mfd: stpmic1: " Paul Cercueil
2022-10-23 9:48 ` [PATCH v3 09/28] mfd: ucb1x00: " Paul Cercueil
2022-10-23 9:48 ` [PATCH v3 10/28] mfd: 88pm860x: " Paul Cercueil
2022-10-23 9:48 ` [PATCH v3 11/28] mfd: mcp-sa11x0: " Paul Cercueil
2022-10-23 9:48 ` [PATCH v3 12/28] mfd: sec: " Paul Cercueil
2022-10-23 9:48 ` [PATCH v3 13/28] mfd: sm501: " Paul Cercueil
2022-10-23 9:48 ` [PATCH v3 14/28] mfd: tc6387xb: " Paul Cercueil
2022-10-23 9:48 ` [PATCH v3 15/28] mfd: tps6586x: " Paul Cercueil
2022-10-23 9:48 ` [PATCH v3 16/28] mfd: wm8994: " Paul Cercueil
2022-10-23 9:48 ` [PATCH v3 17/28] mfd: max77620: " Paul Cercueil
2022-10-23 9:48 ` [PATCH v3 18/28] mfd: t7l66xb: " Paul Cercueil
2022-10-23 9:48 ` [PATCH v3 19/28] mfd: arizona: " Paul Cercueil
2022-10-23 9:48 ` [PATCH v3 20/28] mfd: max14577: " Paul Cercueil
2022-10-23 9:48 ` [PATCH v3 21/28] mfd: max77686: " Paul Cercueil
2022-10-23 9:48 ` [PATCH v3 22/28] mfd: motorola-cpcap: " Paul Cercueil
2022-10-23 9:48 ` [PATCH v3 23/28] mfd: sprd-sc27xx: " Paul Cercueil
2022-10-23 9:48 ` [PATCH v3 24/28] mfd: stmfx: " Paul Cercueil
2022-10-23 9:48 ` Paul Cercueil [this message]
2022-10-23 9:48 ` [PATCH v3 26/28] mfd: tc3589x: " Paul Cercueil
2022-10-23 9:48 ` [PATCH v3 27/28] mfd: tc6393xb: " Paul Cercueil
2022-10-23 9:48 ` [PATCH v3 28/28] mfd: intel-lpss: " Paul Cercueil
2022-10-23 12:55 ` kernel test robot
2022-10-31 14:59 ` Lee Jones
2022-10-31 15:03 ` Nathan Chancellor
2022-10-31 15:11 ` Paul Cercueil
2022-10-31 15:43 ` Lee Jones
2022-10-31 15:53 ` Paul Cercueil
2022-11-01 10:27 ` Lee Jones
2022-11-07 9:44 ` [PATCH v3 00/28] mfd: Remove #ifdef guards for PM functions Lee Jones
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=20221023094852.8035-26-paul@crapouillou.net \
--to=paul@crapouillou.net \
--cc=alexandre.torgue@foss.st.com \
--cc=lee@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-stm32@st-md-mailman.stormreply.com \
--cc=mcoquelin.stm32@gmail.com \
/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 NNTP newsgroup(s).