diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2012-07-06 19:09:20 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2012-07-10 21:37:11 +0200 |
| commit | b633f0507e19224f1527921644722bfb36db9bb0 (patch) | |
| tree | caf9b8a1d74e3838f259cfc70e9e7cbf70934fa3 /drivers/char | |
| parent | 8324be05380be044df8b70cb4bfb0c0b50eec3e5 (diff) | |
| download | linux-stable-b633f0507e19224f1527921644722bfb36db9bb0.tar.gz linux-stable-b633f0507e19224f1527921644722bfb36db9bb0.tar.bz2 linux-stable-b633f0507e19224f1527921644722bfb36db9bb0.zip | |
tpm_tis: Use struct dev_pm_ops for power management
Make the tpm_tis 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() as its suspend
callback directly, without defining its own suspend callback
routine.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/tpm/tpm_tis.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c index 555a643e88cd..89682fa8801e 100644 --- a/drivers/char/tpm/tpm_tis.c +++ b/drivers/char/tpm/tpm_tis.c @@ -806,27 +806,25 @@ module_param_string(hid, tpm_pnp_tbl[TIS_HID_USR_IDX].id, sizeof(tpm_pnp_tbl[TIS_HID_USR_IDX].id), 0444); MODULE_PARM_DESC(hid, "Set additional specific HID for this driver to probe"); #endif -static int tpm_tis_suspend(struct platform_device *dev, pm_message_t msg) -{ - return tpm_pm_suspend(&dev->dev); -} -static int tpm_tis_resume(struct platform_device *dev) +static int tpm_tis_resume(struct device *dev) { - struct tpm_chip *chip = dev_get_drvdata(&dev->dev); + struct tpm_chip *chip = dev_get_drvdata(dev); if (chip->vendor.irq) tpm_tis_reenable_interrupts(chip); - return tpm_pm_resume(&dev->dev); + return tpm_pm_resume(dev); } + +static SIMPLE_DEV_PM_OPS(tpm_tis_pm, tpm_pm_suspend, tpm_tis_resume); + static struct platform_driver tis_drv = { .driver = { .name = "tpm_tis", .owner = THIS_MODULE, + .pm = &tpm_tis_pm, }, - .suspend = tpm_tis_suspend, - .resume = tpm_tis_resume, }; static struct platform_device *pdev; |