From: Paul Cercueil <paul@crapouillou.net> To: Lee Jones <lee.jones@linaro.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 v2 27/30] mfd: stmpe: Remove #ifdef guards for PM related functions Date: Mon, 8 Aug 2022 19:41:04 +0200 [thread overview] Message-ID: <20220808174107.38676-28-paul@crapouillou.net> (raw) In-Reply-To: <20220808174107.38676-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 aeb9ea55f97d..89ffd5a7fab8 100644 --- a/drivers/mfd/stmpe.c +++ b/drivers/mfd/stmpe.c @@ -1508,7 +1508,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); @@ -1529,8 +1528,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 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
WARNING: multiple messages have this Message-ID (diff)
From: Paul Cercueil <paul@crapouillou.net> To: Lee Jones <lee.jones@linaro.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 v2 27/30] mfd: stmpe: Remove #ifdef guards for PM related functions Date: Mon, 8 Aug 2022 19:41:04 +0200 [thread overview] Message-ID: <20220808174107.38676-28-paul@crapouillou.net> (raw) In-Reply-To: <20220808174107.38676-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 aeb9ea55f97d..89ffd5a7fab8 100644 --- a/drivers/mfd/stmpe.c +++ b/drivers/mfd/stmpe.c @@ -1508,7 +1508,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); @@ -1529,8 +1528,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-08-08 17:43 UTC|newest] Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-08-08 17:40 [PATCH v2 00/30] mfd: Remove #ifdef guards for PM functions Paul Cercueil 2022-08-08 17:40 ` [PATCH v2 01/30] pm: Improve EXPORT_*_DEV_PM_OPS macros Paul Cercueil 2022-08-13 14:49 ` Jonathan Cameron 2022-08-23 17:47 ` Rafael J. Wysocki 2022-08-25 22:42 ` Paul Cercueil 2022-09-25 14:52 ` Jonathan Cameron 2022-09-26 12:00 ` Rafael J. Wysocki 2022-09-26 13:27 ` Paul Cercueil 2022-09-26 13:35 ` Rafael J. Wysocki 2022-10-01 17:01 ` Jonathan Cameron 2022-10-02 11:18 ` Paul Cercueil 2022-10-04 18:54 ` Rafael J. Wysocki 2022-10-04 19:12 ` Paul Cercueil 2022-08-08 17:40 ` [PATCH v2 02/30] mfd: 88pm80x: Remove #ifdef guards for PM related functions Paul Cercueil 2022-08-08 17:40 ` [PATCH v2 03/30] mfd: aat2870: " Paul Cercueil 2022-08-08 17:40 ` [PATCH v2 04/30] mfd: adp5520: " Paul Cercueil 2022-08-08 17:40 ` [PATCH v2 05/30] mfd: max8925-i2c: " Paul Cercueil 2022-08-08 17:40 ` [PATCH v2 06/30] mfd: mt6397-irq: " Paul Cercueil 2022-08-08 17:40 ` Paul Cercueil 2022-08-08 17:40 ` [PATCH v2 07/30] mfd: pcf50633: " Paul Cercueil 2022-08-08 17:40 ` [PATCH v2 08/30] mfd: rc5t583-irq: " Paul Cercueil 2022-08-08 17:40 ` [PATCH v2 09/30] mfd: stpmic1: " Paul Cercueil 2022-08-08 17:40 ` [PATCH v2 10/30] mfd: ucb1x00: " Paul Cercueil 2022-08-08 17:40 ` [PATCH v2 11/30] mfd: 88pm860x: " Paul Cercueil 2022-08-08 17:40 ` [PATCH v2 12/30] mfd: intel_soc_pmic: " Paul Cercueil 2022-08-23 14:17 ` Andy Shevchenko 2022-08-08 17:40 ` [PATCH v2 13/30] mfd: mcp-sa11x0: " Paul Cercueil 2022-08-08 17:40 ` [PATCH v2 14/30] mfd: sec: " Paul Cercueil 2022-08-08 17:40 ` [PATCH v2 15/30] mfd: sm501: " Paul Cercueil 2022-08-08 17:40 ` [PATCH v2 16/30] mfd: tc6387xb: " Paul Cercueil 2022-08-08 17:40 ` [PATCH v2 17/30] mfd: tps6586x: " Paul Cercueil 2022-08-08 17:40 ` [PATCH v2 18/30] mfd: wm8994: " Paul Cercueil 2022-08-22 9:43 ` Charles Keepax 2022-08-08 17:40 ` [PATCH v2 19/30] mfd: max77620: " Paul Cercueil 2022-08-08 17:40 ` [PATCH v2 20/30] mfd: t7l66xb: " Paul Cercueil 2022-08-08 17:40 ` [PATCH v2 21/30] mfd: arizona: " Paul Cercueil 2022-08-22 9:44 ` Charles Keepax 2022-08-08 17:40 ` [PATCH v2 22/30] mfd: max14577: " Paul Cercueil 2022-08-08 17:41 ` [PATCH v2 23/30] mfd: max77686: " Paul Cercueil 2022-08-08 17:41 ` [PATCH v2 24/30] mfd: motorola-cpcap: " Paul Cercueil 2022-08-08 17:41 ` [PATCH v2 25/30] mfd: sprd-sc27xx: " Paul Cercueil 2022-08-08 17:41 ` [PATCH v2 26/30] mfd: stmfx: " Paul Cercueil 2022-08-08 17:41 ` Paul Cercueil 2022-08-08 17:41 ` Paul Cercueil [this message] 2022-08-08 17:41 ` [PATCH v2 27/30] mfd: stmpe: " Paul Cercueil 2022-08-08 17:41 ` [PATCH v2 28/30] mfd: tc3589x: " Paul Cercueil 2022-08-08 17:41 ` [PATCH v2 29/30] mfd: tc6393xb: " Paul Cercueil 2022-08-08 17:41 ` [PATCH v2 30/30] mfd: intel-lpss: " Paul Cercueil 2022-08-13 14:50 ` [PATCH v2 00/30] mfd: Remove #ifdef guards for PM functions Jonathan Cameron
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=20220808174107.38676-28-paul@crapouillou.net \ --to=paul@crapouillou.net \ --cc=alexandre.torgue@foss.st.com \ --cc=lee.jones@linaro.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.