diff options
author | Rafael J. Wysocki <rjw@sisk.pl> | 2012-07-06 13:09:28 -0400 |
---|---|---|
committer | Rafael J. Wysocki <rjw@sisk.pl> | 2012-07-10 15:37:18 -0400 |
commit | ca9a2054fe041326888811a94f17459acab9f950 (patch) | |
tree | 19d9940dfef1ed77ea7c1085810e7bb9986169fc /drivers/char | |
parent | b633f0507e19224f1527921644722bfb36db9bb0 (diff) |
tpm_nsc: Use struct dev_pm_ops for power management
Make the tpm_nsc driver define its PM callbacks through
a struct dev_pm_ops object rather than by using legacy PM hooks
in struct platform_driver.
This allows the driver to use tpm_pm_suspend() and tpm_pm_resume()
as its PM callbacks directly, without defining its own PM callback
routines.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Diffstat (limited to 'drivers/char')
-rw-r--r-- | drivers/char/tpm/tpm_nsc.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/drivers/char/tpm/tpm_nsc.c b/drivers/char/tpm/tpm_nsc.c index 8e996575bdbe..640c9a427b59 100644 --- a/drivers/char/tpm/tpm_nsc.c +++ b/drivers/char/tpm/tpm_nsc.c | |||
@@ -274,22 +274,13 @@ static void tpm_nsc_remove(struct device *dev) | |||
274 | } | 274 | } |
275 | } | 275 | } |
276 | 276 | ||
277 | static int tpm_nsc_suspend(struct platform_device *dev, pm_message_t msg) | 277 | static SIMPLE_DEV_PM_OPS(tpm_nsc_pm, tpm_pm_suspend, tpm_pm_resume); |
278 | { | ||
279 | return tpm_pm_suspend(&dev->dev); | ||
280 | } | ||
281 | |||
282 | static int tpm_nsc_resume(struct platform_device *dev) | ||
283 | { | ||
284 | return tpm_pm_resume(&dev->dev); | ||
285 | } | ||
286 | 278 | ||
287 | static struct platform_driver nsc_drv = { | 279 | static struct platform_driver nsc_drv = { |
288 | .suspend = tpm_nsc_suspend, | ||
289 | .resume = tpm_nsc_resume, | ||
290 | .driver = { | 280 | .driver = { |
291 | .name = "tpm_nsc", | 281 | .name = "tpm_nsc", |
292 | .owner = THIS_MODULE, | 282 | .owner = THIS_MODULE, |
283 | .pm = &tpm_nsc_pm, | ||
293 | }, | 284 | }, |
294 | }; | 285 | }; |
295 | 286 | ||