i2c: i801: Remove #ifdef guards for PM related functions
authorPaul Cercueil <paul@crapouillou.net>
Sat, 22 Jul 2023 11:50:32 +0000 (13:50 +0200)
committerAndi Shyti <andi.shyti@kernel.org>
Tue, 8 Aug 2023 13:36:48 +0000 (15:36 +0200)
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>
Link: https://lore.kernel.org/r/20230722115046.27323-9-paul@crapouillou.net
Signed-off-by: Andi Shyti <andi.shyti@kernel.org>
drivers/i2c/busses/i2c-i801.c

index 943b8e6d026dab31aa254e14099f818eca36378b..73ae064321331d9bd920299096698b1456944388 100644 (file)
@@ -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,
        },
 };