mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Paul Cercueil <paul@crapouillou.net>
To: Wolfram Sang <wsa@kernel.org>
Cc: linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org,
	Paul Cercueil <paul@crapouillou.net>,
	Jonathan Cameron <Jonathan.Cameron@huawei.com>
Subject: [PATCH v2 01/22] i2c: au1550: Remove #ifdef guards for PM related functions
Date: Sat, 22 Jul 2023 13:50:25 +0200	[thread overview]
Message-ID: <20230722115046.27323-2-paul@crapouillou.net> (raw)
In-Reply-To: <20230722115046.27323-1-paul@crapouillou.net>

Use the new PM macros for the suspend and resume functions to be
automatically dropped by the compiler when CONFIG_PM or
CONFIG_PM_SLEEP are 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.

Note that the behaviour is slightly different than before; the original
code wrapped the suspend/resume with #ifdef CONFIG_PM guards, which
resulted in these functions being compiled in but never used when
CONFIG_PM_SLEEP was disabled.

Now, those functions are only compiled in when CONFIG_PM_SLEEP is
enabled.

Signed-off-by: Paul Cercueil <paul@crapouillou.net>
Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
---
 drivers/i2c/busses/i2c-au1550.c | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/drivers/i2c/busses/i2c-au1550.c b/drivers/i2c/busses/i2c-au1550.c
index e66c12ecf270..8e43f25c117e 100644
--- a/drivers/i2c/busses/i2c-au1550.c
+++ b/drivers/i2c/busses/i2c-au1550.c
@@ -342,7 +342,6 @@ static void i2c_au1550_remove(struct platform_device *pdev)
 	i2c_au1550_disable(priv);
 }
 
-#ifdef CONFIG_PM
 static int i2c_au1550_suspend(struct device *dev)
 {
 	struct i2c_au1550_data *priv = dev_get_drvdata(dev);
@@ -361,21 +360,13 @@ static int i2c_au1550_resume(struct device *dev)
 	return 0;
 }
 
-static const struct dev_pm_ops i2c_au1550_pmops = {
-	.suspend	= i2c_au1550_suspend,
-	.resume		= i2c_au1550_resume,
-};
-
-#define AU1XPSC_SMBUS_PMOPS (&i2c_au1550_pmops)
-
-#else
-#define AU1XPSC_SMBUS_PMOPS NULL
-#endif
+static DEFINE_SIMPLE_DEV_PM_OPS(i2c_au1550_pmops,
+				i2c_au1550_suspend, i2c_au1550_resume);
 
 static struct platform_driver au1xpsc_smbus_driver = {
 	.driver = {
 		.name	= "au1xpsc_smbus",
-		.pm	= AU1XPSC_SMBUS_PMOPS,
+		.pm	= pm_sleep_ptr(&i2c_au1550_pmops),
 	},
 	.probe		= i2c_au1550_probe,
 	.remove_new	= i2c_au1550_remove,
-- 
2.40.1


  reply	other threads:[~2023-07-22 11:51 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-07-22 11:50 [PATCH v2 00/22] i2c: Use new PM macros Paul Cercueil
2023-07-22 11:50 ` Paul Cercueil [this message]
2023-07-22 11:50 ` [PATCH v2 02/22] i2c: iproc: Remove #ifdef guards for PM related functions Paul Cercueil
2023-07-22 14:39   ` Florian Fainelli
2023-07-22 11:50 ` [PATCH v2 03/22] i2c: brcmstb: " Paul Cercueil
2023-07-22 14:39   ` Florian Fainelli
2023-07-22 11:50 ` [PATCH v2 04/22] i2c: davinci: " Paul Cercueil
2023-07-27  7:40   ` Bartosz Golaszewski
2023-07-22 11:50 ` [PATCH v2 05/22] i2c: designware: " Paul Cercueil
2023-07-27 10:19   ` Jarkko Nikula
2023-07-22 11:50 ` [PATCH v2 06/22] i2c: exynos5: " Paul Cercueil
2023-07-22 11:50 ` [PATCH v2 07/22] i2c: hix5hd2: " Paul Cercueil
2023-07-22 11:50 ` [PATCH v2 08/22] i2c: i801: " Paul Cercueil
2023-08-10 15:25   ` Jean Delvare
2023-07-22 11:50 ` [PATCH v2 09/22] i2c: img-scb: " Paul Cercueil
2023-07-28 12:18   ` Andi Shyti
2023-07-22 11:50 ` [PATCH v2 10/22] i2c: kempld: Convert to use regular device PM Paul Cercueil
2023-07-28 12:19   ` Andi Shyti
2023-07-22 11:50 ` [PATCH v2 11/22] i2c: lpc2k: Remove #ifdef guards for PM related functions Paul Cercueil
2023-07-22 11:50 ` [PATCH v2 12/22] i2c: mt65xx: " Paul Cercueil
2023-07-22 11:50 ` [PATCH v2 13/22] i2c: nomadik: " Paul Cercueil
2023-07-22 11:50 ` [PATCH v2 14/22] i2c: ocores: " Paul Cercueil
2023-07-22 11:50 ` [PATCH v2 15/22] i2c: pnx: " Paul Cercueil
2023-07-22 11:50 ` [PATCH v2 16/22] i2c: pxa: " Paul Cercueil
2023-07-22 11:53 ` [PATCH v2 17/22] i2c: qup: " Paul Cercueil
2023-07-22 11:53 ` [PATCH v2 18/22] i2c: rcar: " Paul Cercueil
2023-07-22 11:53 ` [PATCH v2 19/22] i2c: s3c2410: " Paul Cercueil
2023-07-22 11:53 ` [PATCH v2 20/22] i2c: sh-mobile: " Paul Cercueil
2023-07-22 11:53 ` [PATCH v2 21/22] i2c: virtio: " Paul Cercueil
2023-07-22 13:55   ` kernel test robot
2023-07-22 15:07   ` kernel test robot
2023-07-22 19:06   ` Paul Cercueil
2023-07-22 11:53 ` [PATCH v2 22/22] i2c: mux: pca954x: " Paul Cercueil
2023-08-02 20:10 ` [PATCH v2 00/22] i2c: Use new PM macros Andi Shyti
2023-08-14 15:06   ` Wolfram Sang

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=20230722115046.27323-2-paul@crapouillou.net \
    --to=paul@crapouillou.net \
    --cc=Jonathan.Cameron@huawei.com \
    --cc=linux-i2c@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=wsa@kernel.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®