]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
ahci: st: Switch from CONFIG_PM_SLEEP guards to pm_sleep_ptr()
authorRaphael Gallais-Pou <rgallaispou@gmail.com>
Thu, 9 Jan 2025 17:54:27 +0000 (18:54 +0100)
committerNiklas Cassel <cassel@kernel.org>
Wed, 15 Jan 2025 14:21:27 +0000 (15:21 +0100)
Letting the compiler remove these functions when the kernel is built
without CONFIG_PM_SLEEP support is simpler and less error prone than the
use of #ifdef based kernel configuration guards.

Signed-off-by: Raphael Gallais-Pou <rgallaispou@gmail.com>
Reviewed-by: Niklas Cassel <cassel@kernel.org>
Link: https://lore.kernel.org/r/20250109175427.64384-1-rgallaispou@gmail.com
Signed-off-by: Niklas Cassel <cassel@kernel.org>
drivers/ata/ahci_st.c

index 6b9b4a1dfa15bb6f395cc742f25251376b869a21..4336c8a6e20871fe25b61d6e2043fa15902b3559 100644 (file)
@@ -176,7 +176,6 @@ static int st_ahci_probe(struct platform_device *pdev)
        return 0;
 }
 
-#ifdef CONFIG_PM_SLEEP
 static int st_ahci_suspend(struct device *dev)
 {
        struct ata_host *host = dev_get_drvdata(dev);
@@ -221,9 +220,8 @@ static int st_ahci_resume(struct device *dev)
 
        return ahci_platform_resume_host(dev);
 }
-#endif
 
-static SIMPLE_DEV_PM_OPS(st_ahci_pm_ops, st_ahci_suspend, st_ahci_resume);
+static DEFINE_SIMPLE_DEV_PM_OPS(st_ahci_pm_ops, st_ahci_suspend, st_ahci_resume);
 
 static const struct of_device_id st_ahci_match[] = {
        { .compatible = "st,ahci", },
@@ -234,7 +232,7 @@ MODULE_DEVICE_TABLE(of, st_ahci_match);
 static struct platform_driver st_ahci_driver = {
        .driver = {
                .name = DRV_NAME,
-               .pm = &st_ahci_pm_ops,
+               .pm = pm_sleep_ptr(&st_ahci_pm_ops),
                .of_match_table = st_ahci_match,
        },
        .probe = st_ahci_probe,