[PATCH] mmc: mxs-mmc: Simplify PM hooks

[PATCH] mmc: mxs-mmc: Simplify PM hooks

[Fabio Estevam]

From: Fabio Estevam <fabio.estevam@freescale.com>

By using SIMPLE_DEV_PM_OPS we can make the code smaller and cleaner.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
 drivers/mmc/host/mxs-mmc.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c
index 339059a..c049ac7 100644
--- a/drivers/mmc/host/mxs-mmc.c
+++ b/drivers/mmc/host/mxs-mmc.c
@@ -702,7 +702,7 @@ static int mxs_mmc_remove(struct platform_device *pdev)
 	return 0;
 }
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 static int mxs_mmc_suspend(struct device *dev)
 {
 	struct mmc_host *mmc = dev_get_drvdata(dev);
@@ -722,22 +722,17 @@ static int mxs_mmc_resume(struct device *dev)
 	clk_prepare_enable(ssp->clk);
 	return 0;
 }
-
-static const struct dev_pm_ops mxs_mmc_pm_ops = {
-	.suspend	= mxs_mmc_suspend,
-	.resume		= mxs_mmc_resume,
-};
 #endif
 
+static SIMPLE_DEV_PM_OPS(mxs_mmc_pm_ops, mxs_mmc_suspend, mxs_mmc_resume);
+
 static struct platform_driver mxs_mmc_driver = {
 	.probe		= mxs_mmc_probe,
 	.remove		= mxs_mmc_remove,
 	.id_table	= mxs_ssp_ids,
 	.driver		= {
 		.name	= DRIVER_NAME,
-#ifdef CONFIG_PM
 		.pm	= &mxs_mmc_pm_ops,
-#endif
 		.of_match_table = mxs_mmc_dt_ids,
 	},
 };
-- 
1.9.1

Re: [PATCH] mmc: mxs-mmc: Simplify PM hooks

[Ulf Hansson]

On 18 November 2014 03:43, Fabio Estevam <festevam@gmail.com> wrote:
> From: Fabio Estevam <fabio.estevam@freescale.com>
>
> By using SIMPLE_DEV_PM_OPS we can make the code smaller and cleaner.
>
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>

Thanks! Applied for next.

Kind regards
Uffe


> ---
>  drivers/mmc/host/mxs-mmc.c | 11 +++--------
>  1 file changed, 3 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c
> index 339059a..c049ac7 100644
> --- a/drivers/mmc/host/mxs-mmc.c
> +++ b/drivers/mmc/host/mxs-mmc.c
> @@ -702,7 +702,7 @@ static int mxs_mmc_remove(struct platform_device *pdev)
>         return 0;
>  }
>
> -#ifdef CONFIG_PM
> +#ifdef CONFIG_PM_SLEEP
>  static int mxs_mmc_suspend(struct device *dev)
>  {
>         struct mmc_host *mmc = dev_get_drvdata(dev);
> @@ -722,22 +722,17 @@ static int mxs_mmc_resume(struct device *dev)
>         clk_prepare_enable(ssp->clk);
>         return 0;
>  }
> -
> -static const struct dev_pm_ops mxs_mmc_pm_ops = {
> -       .suspend        = mxs_mmc_suspend,
> -       .resume         = mxs_mmc_resume,
> -};
>  #endif
>
> +static SIMPLE_DEV_PM_OPS(mxs_mmc_pm_ops, mxs_mmc_suspend, mxs_mmc_resume);
> +
>  static struct platform_driver mxs_mmc_driver = {
>         .probe          = mxs_mmc_probe,
>         .remove         = mxs_mmc_remove,
>         .id_table       = mxs_ssp_ids,
>         .driver         = {
>                 .name   = DRIVER_NAME,
> -#ifdef CONFIG_PM
>                 .pm     = &mxs_mmc_pm_ops,
> -#endif
>                 .of_match_table = mxs_mmc_dt_ids,
>         },
>  };
> --
> 1.9.1
>