2021-09-07 03:13:05

by Cai,Huoqing

Subject: [PATCH v2] mmc: omap_hsmmc: Make use of the helper macro SET_RUNTIME_PM_OPS()

Use the helper macro SET_RUNTIME_PM_OPS() instead of the verbose
operators ".runtime_suspend/.runtime_resume", because the
SET_RUNTIME_PM_OPS() is a nice helper macro that could be brought
in to make code a little more concise.

Signed-off-by: Cai Huoqing <[email protected]>
---
v1->v2: *Add "#ifdef CONFIG_PM" around runtime_suspend|resume().
*Remove the unused implementation of omap_hsmmc_context_restore()

drivers/mmc/host/omap_hsmmc.c | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index 2f8038d69f67..7a29ad542e4a 100644
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -702,11 +702,6 @@ static void omap_hsmmc_context_save(struct omap_hsmmc_host *host)

#else

-static int omap_hsmmc_context_restore(struct omap_hsmmc_host *host)
-{
- return 0;
-}
-
static void omap_hsmmc_context_save(struct omap_hsmmc_host *host)
{
}
@@ -2086,6 +2081,7 @@ static int omap_hsmmc_resume(struct device *dev)
}
#endif

+#ifdef CONFIG_PM
static int omap_hsmmc_runtime_suspend(struct device *dev)
{
struct omap_hsmmc_host *host;
@@ -2153,11 +2149,11 @@ static int omap_hsmmc_runtime_resume(struct device *dev)
spin_unlock_irqrestore(&host->irq_lock, flags);
return 0;
}
+#endif

static const struct dev_pm_ops omap_hsmmc_dev_pm_ops = {
SET_SYSTEM_SLEEP_PM_OPS(omap_hsmmc_suspend, omap_hsmmc_resume)
- .runtime_suspend = omap_hsmmc_runtime_suspend,
- .runtime_resume = omap_hsmmc_runtime_resume,
+ SET_RUNTIME_PM_OPS(omap_hsmmc_runtime_suspend, omap_hsmmc_runtime_resume, NULL)
};

static struct platform_driver omap_hsmmc_driver = {
--
2.25.1

2021-09-09 14:53:24

by Ulf Hansson

Subject: Re: [PATCH v2] mmc: omap_hsmmc: Make use of the helper macro SET_RUNTIME_PM_OPS()

On Tue, 7 Sept 2021 at 04:59, Cai Huoqing <[email protected]> wrote:
>
> Use the helper macro SET_RUNTIME_PM_OPS() instead of the verbose
> operators ".runtime_suspend/.runtime_resume", because the
> SET_RUNTIME_PM_OPS() is a nice helper macro that could be brought
> in to make code a little more concise.
>
> Signed-off-by: Cai Huoqing <[email protected]>

Queued for v5.16 on the temporary devel branch, thanks!

Kind regards
Uffe


> ---
> v1->v2: *Add "#ifdef CONFIG_PM" around runtime_suspend|resume().
> *Remove the unused implementation of omap_hsmmc_context_restore()
>
> drivers/mmc/host/omap_hsmmc.c | 10 +++-------
> 1 file changed, 3 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
> index 2f8038d69f67..7a29ad542e4a 100644
> --- a/drivers/mmc/host/omap_hsmmc.c
> +++ b/drivers/mmc/host/omap_hsmmc.c
> @@ -702,11 +702,6 @@ static void omap_hsmmc_context_save(struct omap_hsmmc_host *host)
>
> #else
>
> -static int omap_hsmmc_context_restore(struct omap_hsmmc_host *host)
> -{
> - return 0;
> -}
> -
> static void omap_hsmmc_context_save(struct omap_hsmmc_host *host)
> {
> }
> @@ -2086,6 +2081,7 @@ static int omap_hsmmc_resume(struct device *dev)
> }
> #endif
>
> +#ifdef CONFIG_PM
> static int omap_hsmmc_runtime_suspend(struct device *dev)
> {
> struct omap_hsmmc_host *host;
> @@ -2153,11 +2149,11 @@ static int omap_hsmmc_runtime_resume(struct device *dev)
> spin_unlock_irqrestore(&host->irq_lock, flags);
> return 0;
> }
> +#endif
>
> static const struct dev_pm_ops omap_hsmmc_dev_pm_ops = {
> SET_SYSTEM_SLEEP_PM_OPS(omap_hsmmc_suspend, omap_hsmmc_resume)
> - .runtime_suspend = omap_hsmmc_runtime_suspend,
> - .runtime_resume = omap_hsmmc_runtime_resume,
> + SET_RUNTIME_PM_OPS(omap_hsmmc_runtime_suspend, omap_hsmmc_runtime_resume, NULL)
> };
>
> static struct platform_driver omap_hsmmc_driver = {
> --
> 2.25.1
>