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

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

9
drivers/mmc/host/atmel-mci.c
View File

@ -2622,7 +2622,6 @@ static void atmci_remove(struct platform_device *pdev)
pm_runtime_put_noidle(dev); pm_runtime_put_noidle(dev);
} }
#ifdef CONFIG_PM
static int atmci_runtime_suspend(struct device *dev) static int atmci_runtime_suspend(struct device *dev)
{ {
struct atmel_mci *host = dev_get_drvdata(dev); struct atmel_mci *host = dev_get_drvdata(dev);
@ -2642,12 +2641,10 @@ static int atmci_runtime_resume(struct device *dev)
return clk_prepare_enable(host->mck); return clk_prepare_enable(host->mck);
} }
#endif
static const struct dev_pm_ops atmci_dev_pm_ops = { static const struct dev_pm_ops atmci_dev_pm_ops = {
SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend, SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend, pm_runtime_force_resume)
pm_runtime_force_resume) RUNTIME_PM_OPS(atmci_runtime_suspend, atmci_runtime_resume, NULL)
SET_RUNTIME_PM_OPS(atmci_runtime_suspend, atmci_runtime_resume, NULL)
}; };
static struct platform_driver atmci_driver = { static struct platform_driver atmci_driver = {
@ -2657,7 +2654,7 @@ static struct platform_driver atmci_driver = {
.name = "atmel_mci", .name = "atmel_mci",
.probe_type = PROBE_PREFER_ASYNCHRONOUS, .probe_type = PROBE_PREFER_ASYNCHRONOUS,
.of_match_table = atmci_dt_ids, .of_match_table = atmci_dt_ids,
.pm = &atmci_dev_pm_ops, .pm = pm_ptr(&atmci_dev_pm_ops),
}, },
}; };
module_platform_driver(atmci_driver); module_platform_driver(atmci_driver);