Skip to content

Commit

Permalink
tpm_tis: Use struct dev_pm_ops for power management
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Rafael J. Wysocki committed Jul 10, 2012
1 parent 8324be0 commit b633f05
Showing 1 changed file with 7 additions and 9 deletions.
16 changes: 7 additions & 9 deletions drivers/char/tpm/tpm_tis.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit b633f05

Please sign in to comment.