Re: [PATCH v2 08/22] i2c: i801: Remove #ifdef guards for PM related functions

Jean Delvare
2023-08-10T15:25:19Z

Hi Paul,

On Sat, 22 Jul 2023 13:50:32 +0200, Paul Cercueil wrote:
> 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.
>
> Signed-off-by: Paul Cercueil <paul@crapouillou.net>
> Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
>
> ---
> Cc: Jean Delvare <jdelvare@suse.com>
> ---
> drivers/i2c/busses/i2c-i801.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c
> index 943b8e6d026d..73ae06432133 100644
> --- a/drivers/i2c/busses/i2c-i801.c
> +++ b/drivers/i2c/busses/i2c-i801.c
> @@ -1808,7 +1808,6 @@ static void i801_shutdown(struct pci_dev *dev)
> pci_write_config_byte(dev, SMBHSTCFG, priv->original_hstcfg);
> }
>
> -#ifdef CONFIG_PM_SLEEP
> static int i801_suspend(struct device *dev)
> {
> struct i801_priv *priv = dev_get_drvdata(dev);
> @@ -1827,9 +1826,8 @@ static int i801_resume(struct device *dev)
>
> return 0;
> }
> -#endif
>
> -static SIMPLE_DEV_PM_OPS(i801_pm_ops, i801_suspend, i801_resume);
> +static DEFINE_SIMPLE_DEV_PM_OPS(i801_pm_ops, i801_suspend, i801_resume);
>
> static struct pci_driver i801_driver = {
> .name = DRV_NAME,
> @@ -1838,7 +1836,7 @@ static struct pci_driver i801_driver = {
> .remove = i801_remove,
> .shutdown = i801_shutdown,
> .driver = {
> - .pm = &i801_pm_ops,
> + .pm = pm_sleep_ptr(&i801_pm_ops),
> .probe_type = PROBE_PREFER_ASYNCHRONOUS,
> },
> };

As far as I can see, this is the same as:

https://lore.kernel.org/linux-i2c/20230628091522.3e58dfb2@endymion.delvare/T/#mbd96bc42299e23f43ff1ebd56e61656882994afc

submitted by Heiner Kallweit back in March, review by myself in June,
but not applied yet. So:

Reviewed-by: Jean Delvare <jdelvare@suse.de>

--
Jean Delvare
SUSE L3 Support