summaryrefslogtreecommitdiff
path: root/drivers/char
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2012-07-06 19:09:13 +0200
committerRafael J. Wysocki <rjw@sisk.pl>2012-07-10 21:37:02 +0200
commit8324be05380be044df8b70cb4bfb0c0b50eec3e5 (patch)
tree0a24c5ab2c8893bbf532055580f4e72f35ff59a1 /drivers/char
parent035e2ce8eb7412dbcb8522c19676a1dd52f3c024 (diff)
downloadlinux-3.10-8324be05380be044df8b70cb4bfb0c0b50eec3e5.tar.gz
linux-3.10-8324be05380be044df8b70cb4bfb0c0b50eec3e5.tar.bz2
linux-3.10-8324be05380be044df8b70cb4bfb0c0b50eec3e5.zip
tpm_atmel: Use struct dev_pm_ops for power management
Make the tpm_atmel 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_atmel.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/drivers/char/tpm/tpm_atmel.c b/drivers/char/tpm/tpm_atmel.c
index 8244d87f86a..678d57019dc 100644
--- a/drivers/char/tpm/tpm_atmel.c
+++ b/drivers/char/tpm/tpm_atmel.c
@@ -168,22 +168,14 @@ static void atml_plat_remove(void)
}
}
-static int tpm_atml_suspend(struct platform_device *dev, pm_message_t msg)
-{
- return tpm_pm_suspend(&dev->dev);
-}
+static SIMPLE_DEV_PM_OPS(tpm_atml_pm, tpm_pm_suspend, tpm_pm_resume);
-static int tpm_atml_resume(struct platform_device *dev)
-{
- return tpm_pm_resume(&dev->dev);
-}
static struct platform_driver atml_drv = {
.driver = {
.name = "tpm_atmel",
.owner = THIS_MODULE,
+ .pm = &tpm_atml_pm,
},
- .suspend = tpm_atml_suspend,
- .resume = tpm_atml_resume,
};
static int __init init_atmel(void)