]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
mfd: atmel-flexcom: Remove #ifdef CONFIG_PM_SLEEP
authorClaudiu Beznea <claudiu.beznea@microchip.com>
Thu, 28 Oct 2021 13:51:37 +0000 (16:51 +0300)
committerPaolo Pisati <paolo.pisati@canonical.com>
Fri, 28 Jan 2022 09:59:18 +0000 (10:59 +0100)
BugLink: https://bugs.launchpad.net/bugs/1959376
[ Upstream commit 8c0fad75dcaa650e3f3145a2c35847bc6a65cb7f ]

Remove compilation flag and use __maybe_unused and pm_ptr instead.

Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
Acked-by: Nicolas Ferre <nicolas.ferre@microchip.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Link: https://lore.kernel.org/r/20211028135138.3481166-2-claudiu.beznea@microchip.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
drivers/mfd/atmel-flexcom.c

index d2f5c073fdf31553d4d107c7d605f0fe155671d8..962f66dc8813ef7ba7cb0028766d6bd1359cbe21 100644 (file)
@@ -87,8 +87,7 @@ static const struct of_device_id atmel_flexcom_of_match[] = {
 };
 MODULE_DEVICE_TABLE(of, atmel_flexcom_of_match);
 
-#ifdef CONFIG_PM_SLEEP
-static int atmel_flexcom_resume(struct device *dev)
+static int __maybe_unused atmel_flexcom_resume(struct device *dev)
 {
        struct atmel_flexcom *ddata = dev_get_drvdata(dev);
        int err;
@@ -105,7 +104,6 @@ static int atmel_flexcom_resume(struct device *dev)
 
        return 0;
 }
-#endif
 
 static SIMPLE_DEV_PM_OPS(atmel_flexcom_pm_ops, NULL,
                         atmel_flexcom_resume);
@@ -114,7 +112,7 @@ static struct platform_driver atmel_flexcom_driver = {
        .probe  = atmel_flexcom_probe,
        .driver = {
                .name           = "atmel_flexcom",
-               .pm             = &atmel_flexcom_pm_ops,
+               .pm             = pm_ptr(&atmel_flexcom_pm_ops),
                .of_match_table = atmel_flexcom_of_match,
        },
 };