On 8/15/25 03:34, 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>
> ---
> drivers/mmc/host/sdhci-st.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
Reviewed-by: Patrice Chotard <patrice.chotard@foss.st.com>
Thanks
Patrice
>
> diff --git a/drivers/mmc/host/sdhci-st.c b/drivers/mmc/host/sdhci-st.c
> index 9157342ff7a4..bf6685805137 100644
> --- a/drivers/mmc/host/sdhci-st.c
> +++ b/drivers/mmc/host/sdhci-st.c
> @@ -445,7 +445,6 @@ static void sdhci_st_remove(struct platform_device *pdev)
> reset_control_assert(rstc);
> }
>
> -#ifdef CONFIG_PM_SLEEP
> static int sdhci_st_suspend(struct device *dev)
> {
> struct sdhci_host *host = dev_get_drvdata(dev);
> @@ -492,9 +491,8 @@ static int sdhci_st_resume(struct device *dev)
>
> return sdhci_resume_host(host);
> }
> -#endif
>
> -static SIMPLE_DEV_PM_OPS(sdhci_st_pmops, sdhci_st_suspend, sdhci_st_resume);
> +static DEFINE_SIMPLE_DEV_PM_OPS(sdhci_st_pmops, sdhci_st_suspend, sdhci_st_resume);
>
> static const struct of_device_id st_sdhci_match[] = {
> { .compatible = "st,sdhci" },
> @@ -509,7 +507,7 @@ static struct platform_driver sdhci_st_driver = {
> .driver = {
> .name = "sdhci-st",
> .probe_type = PROBE_PREFER_ASYNCHRONOUS,
> - .pm = &sdhci_st_pmops,
> + .pm = pm_sleep_ptr(&sdhci_st_pmops),
> .of_match_table = st_sdhci_match,
> },
> };