]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
mmc: rtsx_usb_sdmmc: use modern PM macros
authorJisheng Zhang <jszhang@kernel.org>
Fri, 15 Aug 2025 01:33:49 +0000 (09:33 +0800)
committerUlf Hansson <ulf.hansson@linaro.org>
Fri, 22 Aug 2025 10:14:04 +0000 (12:14 +0200)
Use the modern 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: Jisheng Zhang <jszhang@kernel.org>
Link: https://lore.kernel.org/r/20250815013413.28641-15-jszhang@kernel.org
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
drivers/mmc/host/rtsx_usb_sdmmc.c

index 70bd21084b977caf520c314918f4e6567dbebedf..84674659a84d4afad8d45d2198d4871fc87539ac 100644 (file)
@@ -1455,7 +1455,6 @@ static void rtsx_usb_sdmmc_drv_remove(struct platform_device *pdev)
                ": Realtek USB SD/MMC module has been removed\n");
 }
 
-#ifdef CONFIG_PM
 static int rtsx_usb_sdmmc_runtime_suspend(struct device *dev)
 {
        struct rtsx_usb_sdmmc *host = dev_get_drvdata(dev);
@@ -1473,11 +1472,9 @@ static int rtsx_usb_sdmmc_runtime_resume(struct device *dev)
                mmc_detect_change(host->mmc, 0);
        return 0;
 }
-#endif
 
 static const struct dev_pm_ops rtsx_usb_sdmmc_dev_pm_ops = {
-       SET_RUNTIME_PM_OPS(rtsx_usb_sdmmc_runtime_suspend,
-                          rtsx_usb_sdmmc_runtime_resume, NULL)
+       RUNTIME_PM_OPS(rtsx_usb_sdmmc_runtime_suspend, rtsx_usb_sdmmc_runtime_resume, NULL)
 };
 
 static const struct platform_device_id rtsx_usb_sdmmc_ids[] = {
@@ -1496,7 +1493,7 @@ static struct platform_driver rtsx_usb_sdmmc_driver = {
        .driver         = {
                .name   = "rtsx_usb_sdmmc",
                .probe_type = PROBE_PREFER_ASYNCHRONOUS,
-               .pm     = &rtsx_usb_sdmmc_dev_pm_ops,
+               .pm     = pm_ptr(&rtsx_usb_sdmmc_dev_pm_ops),
        },
 };
 module_platform_driver(rtsx_usb_sdmmc_driver);