On 15/08/2025 04:33, Jisheng Zhang wrote:
> 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>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
> ---
> drivers/mmc/host/sdhci-acpi.c | 18 ++++--------------
> 1 file changed, 4 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/mmc/host/sdhci-acpi.c b/drivers/mmc/host/sdhci-acpi.c
> index 2d46d4854fa1..84c7054607fc 100644
> --- a/drivers/mmc/host/sdhci-acpi.c
> +++ b/drivers/mmc/host/sdhci-acpi.c
> @@ -973,8 +973,7 @@ static void sdhci_acpi_remove(struct platform_device *pdev)
> c->slot->free_slot(pdev);
> }
>
> -static void __maybe_unused sdhci_acpi_reset_signal_voltage_if_needed(
> - struct device *dev)
> +static void sdhci_acpi_reset_signal_voltage_if_needed(struct device *dev)
> {
> struct sdhci_acpi_host *c = dev_get_drvdata(dev);
> struct sdhci_host *host = c->host;
> @@ -989,8 +988,6 @@ static void __maybe_unused sdhci_acpi_reset_signal_voltage_if_needed(
> }
> }
>
> -#ifdef CONFIG_PM_SLEEP
> -
> static int sdhci_acpi_suspend(struct device *dev)
> {
> struct sdhci_acpi_host *c = dev_get_drvdata(dev);
> @@ -1017,10 +1014,6 @@ static int sdhci_acpi_resume(struct device *dev)
> return sdhci_resume_host(c->host);
> }
>
> -#endif
> -
> -#ifdef CONFIG_PM
> -
> static int sdhci_acpi_runtime_suspend(struct device *dev)
> {
> struct sdhci_acpi_host *c = dev_get_drvdata(dev);
> @@ -1045,12 +1038,9 @@ static int sdhci_acpi_runtime_resume(struct device *dev)
> return 0;
> }
>
> -#endif
> -
> static const struct dev_pm_ops sdhci_acpi_pm_ops = {
> - SET_SYSTEM_SLEEP_PM_OPS(sdhci_acpi_suspend, sdhci_acpi_resume)
> - SET_RUNTIME_PM_OPS(sdhci_acpi_runtime_suspend,
> - sdhci_acpi_runtime_resume, NULL)
> + SYSTEM_SLEEP_PM_OPS(sdhci_acpi_suspend, sdhci_acpi_resume)
> + RUNTIME_PM_OPS(sdhci_acpi_runtime_suspend, sdhci_acpi_runtime_resume, NULL)
> };
>
> static struct platform_driver sdhci_acpi_driver = {
> @@ -1058,7 +1048,7 @@ static struct platform_driver sdhci_acpi_driver = {
> .name = "sdhci-acpi",
> .probe_type = PROBE_PREFER_ASYNCHRONOUS,
> .acpi_match_table = sdhci_acpi_ids,
> - .pm = &sdhci_acpi_pm_ops,
> + .pm = pm_ptr(&sdhci_acpi_pm_ops),
> },
> .probe = sdhci_acpi_probe,
> .remove = sdhci_acpi_remove,