i2c: brcmstb: Remove #ifdef guards for PM related functions
authorPaul Cercueil <paul@crapouillou.net>
Sat, 22 Jul 2023 11:50:27 +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>
Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>
Link: https://lore.kernel.org/r/20230722115046.27323-4-paul@crapouillou.net
Signed-off-by: Andi Shyti <andi.shyti@kernel.org>
drivers/i2c/busses/i2c-brcmstb.c

index cf92cbcb8c86bb8b23ffe46609cd5837b76349e0..c778bcca95feade13b383f29a192b42728f88153 100644 (file)
@@ -697,7 +697,6 @@ static void brcmstb_i2c_remove(struct platform_device *pdev)
        i2c_del_adapter(&dev->adapter);
 }
 
-#ifdef CONFIG_PM_SLEEP
 static int brcmstb_i2c_suspend(struct device *dev)
 {
        struct brcmstb_i2c_dev *i2c_dev = dev_get_drvdata(dev);
@@ -715,10 +714,9 @@ static int brcmstb_i2c_resume(struct device *dev)
 
        return 0;
 }
-#endif
 
-static SIMPLE_DEV_PM_OPS(brcmstb_i2c_pm, brcmstb_i2c_suspend,
-                        brcmstb_i2c_resume);
+static DEFINE_SIMPLE_DEV_PM_OPS(brcmstb_i2c_pm, brcmstb_i2c_suspend,
+                               brcmstb_i2c_resume);
 
 static const struct of_device_id brcmstb_i2c_of_match[] = {
        {.compatible = "brcm,brcmstb-i2c"},
@@ -732,7 +730,7 @@ static struct platform_driver brcmstb_i2c_driver = {
        .driver = {
                   .name = "brcmstb-i2c",
                   .of_match_table = brcmstb_i2c_of_match,
-                  .pm = &brcmstb_i2c_pm,
+                  .pm = pm_sleep_ptr(&brcmstb_i2c_pm),
                   },
        .probe = brcmstb_i2c_probe,
        .remove_new = brcmstb_i2c_remove,