Re: [PATCH 1/8] mfd: ti_am335x_tscadc: Use SIMPLE_DEV_PM_OPS helper macro

Lee Jones
2016-06-08T15:35:36Z

On Tue, 31 May 2016, Andrew F. Davis wrote:

> Replace ifdefs with SIMPLE_DEV_PM_OPS helper macro.
>
> Signed-off-by: Andrew F. Davis <afd@ti.com>
> ---
> drivers/mfd/ti_am335x_tscadc.c | 16 ++++------------
> 1 file changed, 4 insertions(+), 12 deletions(-)

Acked-by: Lee Jones <lee.jones@linaro.org>

> diff --git a/drivers/mfd/ti_am335x_tscadc.c b/drivers/mfd/ti_am335x_tscadc.c
> index e4e4b22..644128b 100644
> --- a/drivers/mfd/ti_am335x_tscadc.c
> +++ b/drivers/mfd/ti_am335x_tscadc.c
> @@ -310,8 +310,7 @@ static int ti_tscadc_remove(struct platform_device *pdev)
> return 0;
> }
>
> -#ifdef CONFIG_PM
> -static int tscadc_suspend(struct device *dev)
> +static int __maybe_unused tscadc_suspend(struct device *dev)
> {
> struct ti_tscadc_dev *tscadc_dev = dev_get_drvdata(dev);
>
> @@ -321,7 +320,7 @@ static int tscadc_suspend(struct device *dev)
> return 0;
> }
>
> -static int tscadc_resume(struct device *dev)
> +static int __maybe_unused tscadc_resume(struct device *dev)
> {
> struct ti_tscadc_dev *tscadc_dev = dev_get_drvdata(dev);
> u32 ctrl;
> @@ -347,14 +346,7 @@ static int tscadc_resume(struct device *dev)
> return 0;
> }
>
> -static const struct dev_pm_ops tscadc_pm_ops = {
> - .suspend = tscadc_suspend,
> - .resume = tscadc_resume,
> -};
> -#define TSCADC_PM_OPS (&tscadc_pm_ops)
> -#else
> -#define TSCADC_PM_OPS NULL
> -#endif
> +static SIMPLE_DEV_PM_OPS(tscadc_pm_ops, tscadc_suspend, tscadc_resume);
>
> static const struct of_device_id ti_tscadc_dt_ids[] = {
> { .compatible = "ti,am3359-tscadc", },
> @@ -365,7 +357,7 @@ MODULE_DEVICE_TABLE(of, ti_tscadc_dt_ids);
> static struct platform_driver ti_tscadc_driver = {
> .driver = {
> .name = "ti_am3359-tscadc",
> - .pm = TSCADC_PM_OPS,
> + .pm = &tscadc_pm_ops,
> .of_match_table = ti_tscadc_dt_ids,
> },
> .probe = ti_tscadc_probe,

--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog