diff options
author | Andrew F. Davis <afd@ti.com> | 2016-06-08 11:54:32 -0400 |
---|---|---|
committer | Lee Jones <lee.jones@linaro.org> | 2016-06-29 05:14:35 -0400 |
commit | dae936a090e5778c6c0b6494b05d1c0aba142e1c (patch) | |
tree | 3d277f2b0c72ee44996d7fad96be4ae34584bab5 /drivers/mfd | |
parent | 86bda6a900f257c2c910894a743f27967d784fd4 (diff) |
mfd: ti_am335x_tscadc: Use SIMPLE_DEV_PM_OPS helper macro
Replace ifdefs with SIMPLE_DEV_PM_OPS helper macro.
Signed-off-by: Andrew F. Davis <afd@ti.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/mfd')
-rw-r--r-- | drivers/mfd/ti_am335x_tscadc.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/drivers/mfd/ti_am335x_tscadc.c b/drivers/mfd/ti_am335x_tscadc.c index 3d4fbc85800e..f147fe780a0f 100644 --- a/drivers/mfd/ti_am335x_tscadc.c +++ b/drivers/mfd/ti_am335x_tscadc.c | |||
@@ -295,8 +295,7 @@ static int ti_tscadc_remove(struct platform_device *pdev) | |||
295 | return 0; | 295 | return 0; |
296 | } | 296 | } |
297 | 297 | ||
298 | #ifdef CONFIG_PM | 298 | static int __maybe_unused tscadc_suspend(struct device *dev) |
299 | static int tscadc_suspend(struct device *dev) | ||
300 | { | 299 | { |
301 | struct ti_tscadc_dev *tscadc_dev = dev_get_drvdata(dev); | 300 | struct ti_tscadc_dev *tscadc_dev = dev_get_drvdata(dev); |
302 | 301 | ||
@@ -306,7 +305,7 @@ static int tscadc_suspend(struct device *dev) | |||
306 | return 0; | 305 | return 0; |
307 | } | 306 | } |
308 | 307 | ||
309 | static int tscadc_resume(struct device *dev) | 308 | static int __maybe_unused tscadc_resume(struct device *dev) |
310 | { | 309 | { |
311 | struct ti_tscadc_dev *tscadc_dev = dev_get_drvdata(dev); | 310 | struct ti_tscadc_dev *tscadc_dev = dev_get_drvdata(dev); |
312 | u32 ctrl; | 311 | u32 ctrl; |
@@ -332,14 +331,7 @@ static int tscadc_resume(struct device *dev) | |||
332 | return 0; | 331 | return 0; |
333 | } | 332 | } |
334 | 333 | ||
335 | static const struct dev_pm_ops tscadc_pm_ops = { | 334 | static SIMPLE_DEV_PM_OPS(tscadc_pm_ops, tscadc_suspend, tscadc_resume); |
336 | .suspend = tscadc_suspend, | ||
337 | .resume = tscadc_resume, | ||
338 | }; | ||
339 | #define TSCADC_PM_OPS (&tscadc_pm_ops) | ||
340 | #else | ||
341 | #define TSCADC_PM_OPS NULL | ||
342 | #endif | ||
343 | 335 | ||
344 | static const struct of_device_id ti_tscadc_dt_ids[] = { | 336 | static const struct of_device_id ti_tscadc_dt_ids[] = { |
345 | { .compatible = "ti,am3359-tscadc", }, | 337 | { .compatible = "ti,am3359-tscadc", }, |
@@ -350,7 +342,7 @@ MODULE_DEVICE_TABLE(of, ti_tscadc_dt_ids); | |||
350 | static struct platform_driver ti_tscadc_driver = { | 342 | static struct platform_driver ti_tscadc_driver = { |
351 | .driver = { | 343 | .driver = { |
352 | .name = "ti_am3359-tscadc", | 344 | .name = "ti_am3359-tscadc", |
353 | .pm = TSCADC_PM_OPS, | 345 | .pm = &tscadc_pm_ops, |
354 | .of_match_table = ti_tscadc_dt_ids, | 346 | .of_match_table = ti_tscadc_dt_ids, |
355 | }, | 347 | }, |
356 | .probe = ti_tscadc_probe, | 348 | .probe = ti_tscadc_probe, |