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

mmc: sdhci-cadence: 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-24-jszhang@kernel.org
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
Jisheng Zhang 2025-08-15 09:33:58 +08:00 committed by Ulf Hansson
parent d8d84cf91a
commit 1c6316a5ce
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/mmc/host/sdhci-cadence.c
View File

@ -611,7 +611,6 @@ static int sdhci_cdns_probe(struct platform_device *pdev)
return sdhci_add_host(host); return sdhci_add_host(host);
} }
#ifdef CONFIG_PM_SLEEP
static int sdhci_cdns_resume(struct device *dev) static int sdhci_cdns_resume(struct device *dev)
{ {
struct sdhci_host *host = dev_get_drvdata(dev); struct sdhci_host *host = dev_get_drvdata(dev);
@ -638,11 +637,8 @@ static int sdhci_cdns_resume(struct device *dev)
return ret; return ret;
} }
#endif
static const struct dev_pm_ops sdhci_cdns_pm_ops = { static DEFINE_SIMPLE_DEV_PM_OPS(sdhci_cdns_pm_ops, sdhci_pltfm_suspend, sdhci_cdns_resume);
SET_SYSTEM_SLEEP_PM_OPS(sdhci_pltfm_suspend, sdhci_cdns_resume)
};
static const struct of_device_id sdhci_cdns_match[] = { static const struct of_device_id sdhci_cdns_match[] = {
{ {
@ -666,7 +662,7 @@ static struct platform_driver sdhci_cdns_driver = {
.driver = { .driver = {
.name = "sdhci-cdns", .name = "sdhci-cdns",
.probe_type = PROBE_PREFER_ASYNCHRONOUS, .probe_type = PROBE_PREFER_ASYNCHRONOUS,
.pm = &sdhci_cdns_pm_ops, .pm = pm_sleep_ptr(&sdhci_cdns_pm_ops),
.of_match_table = sdhci_cdns_match, .of_match_table = sdhci_cdns_match,
}, },
.probe = sdhci_cdns_probe, .probe = sdhci_cdns_probe,