Gh0st
/
linux
mirror of https://github.com/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mmc: rtsx_usb_sdmmc: use modern PM macros 

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>
This commit is contained in:
Jisheng Zhang 2025-08-15 09:33:49 +08:00 committed by Ulf Hansson
parent 8e8214d98b
commit 99a44c327f
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/mmc/host/rtsx_usb_sdmmc.c
View 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"); ": Realtek USB SD/MMC module has been removed\n");
} }
#ifdef CONFIG_PM
static int rtsx_usb_sdmmc_runtime_suspend(struct device *dev) static int rtsx_usb_sdmmc_runtime_suspend(struct device *dev)
{ {
struct rtsx_usb_sdmmc *host = dev_get_drvdata(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); mmc_detect_change(host->mmc, 0);
return 0; return 0;
} }
#endif
static const struct dev_pm_ops rtsx_usb_sdmmc_dev_pm_ops = { static const struct dev_pm_ops rtsx_usb_sdmmc_dev_pm_ops = {
SET_RUNTIME_PM_OPS(rtsx_usb_sdmmc_runtime_suspend, RUNTIME_PM_OPS(rtsx_usb_sdmmc_runtime_suspend, rtsx_usb_sdmmc_runtime_resume, NULL)
rtsx_usb_sdmmc_runtime_resume, NULL)
}; };
static const struct platform_device_id rtsx_usb_sdmmc_ids[] = { static const struct platform_device_id rtsx_usb_sdmmc_ids[] = {
@ -1496,7 +1493,7 @@ static struct platform_driver rtsx_usb_sdmmc_driver = {
.driver = { .driver = {
.name = "rtsx_usb_sdmmc", .name = "rtsx_usb_sdmmc",
.probe_type = PROBE_PREFER_ASYNCHRONOUS, .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); module_platform_driver(rtsx_usb_sdmmc_driver);