diff options
| author | Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> | 2016-09-27 12:00:13 +0300 |
|---|---|---|
| committer | Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> | 2016-09-27 12:00:13 +0300 |
| commit | 4886cd80cb8eab175a527f82ea8fc676e70309fa (patch) | |
| tree | c0806eb8758f8540fcf44b94c8ec009a513441bf /drivers/char/tpm/tpm_crb.c | |
| parent | 8a17ef9d8543744a0c6a6f5fdc65b5770e7eaa64 (diff) | |
Revert "tmp/tpm_crb: implement runtime pm for tpm_crb"
This reverts commit e350e24694e447e6ab7312fffae5ca31a0bb5165.
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Diffstat (limited to 'drivers/char/tpm/tpm_crb.c')
| -rw-r--r-- | drivers/char/tpm/tpm_crb.c | 37 |
1 files changed, 3 insertions, 34 deletions
diff --git a/drivers/char/tpm/tpm_crb.c b/drivers/char/tpm/tpm_crb.c index aa0ef742ac03..d385e63008a6 100644 --- a/drivers/char/tpm/tpm_crb.c +++ b/drivers/char/tpm/tpm_crb.c @@ -19,7 +19,6 @@ #include <linux/highmem.h> #include <linux/rculist.h> #include <linux/module.h> -#include <linux/pm_runtime.h> #include "tpm.h" #define ACPI_SIG_TPM2 "TPM2" @@ -153,6 +152,8 @@ static int __maybe_unused crb_cmd_ready(struct device *dev, return 0; } +static SIMPLE_DEV_PM_OPS(crb_pm, tpm_pm_suspend, tpm_pm_resume); + static u8 crb_status(struct tpm_chip *chip) { struct crb_priv *priv = dev_get_drvdata(&chip->dev); @@ -435,16 +436,9 @@ static int crb_acpi_add(struct acpi_device *device) if (rc) return rc; - pm_runtime_set_active(dev); - pm_runtime_enable(dev); - rc = tpm_chip_register(chip); - if (rc) { + if (rc) crb_go_idle(dev, priv); - pm_runtime_disable(dev); - } - - pm_runtime_put(dev); return rc; } @@ -456,34 +450,9 @@ static int crb_acpi_remove(struct acpi_device *device) tpm_chip_unregister(chip); - pm_runtime_disable(dev); - return 0; } -#ifdef CONFIG_PM -static int crb_pm_runtime_suspend(struct device *dev) -{ - struct tpm_chip *chip = dev_get_drvdata(dev); - struct crb_priv *priv = dev_get_drvdata(&chip->dev); - - return crb_go_idle(dev, priv); -} - -static int crb_pm_runtime_resume(struct device *dev) -{ - struct tpm_chip *chip = dev_get_drvdata(dev); - struct crb_priv *priv = dev_get_drvdata(&chip->dev); - - return crb_cmd_ready(dev, priv); -} -#endif /* CONFIG_PM */ - -static const struct dev_pm_ops crb_pm = { - SET_SYSTEM_SLEEP_PM_OPS(tpm_pm_suspend, tpm_pm_resume) - SET_RUNTIME_PM_OPS(crb_pm_runtime_suspend, crb_pm_runtime_resume, NULL) -}; - static struct acpi_device_id crb_device_ids[] = { {"MSFT0101", 0}, {"", 0}, |