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-interface.c | |
| parent | 8a17ef9d8543744a0c6a6f5fdc65b5770e7eaa64 (diff) | |
| download | linux-4886cd80cb8eab175a527f82ea8fc676e70309fa.tar.bz2 | |
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-interface.c')
| -rw-r--r-- | drivers/char/tpm/tpm-interface.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c index 77d83c98d67f..8de61876f633 100644 --- a/drivers/char/tpm/tpm-interface.c +++ b/drivers/char/tpm/tpm-interface.c @@ -29,7 +29,6 @@ #include <linux/mutex.h> #include <linux/spinlock.h> #include <linux/freezer.h> -#include <linux/pm_runtime.h> #include "tpm.h" #include "tpm_eventlog.h" @@ -357,8 +356,6 @@ ssize_t tpm_transmit(struct tpm_chip *chip, const u8 *buf, size_t bufsiz, if (!(flags & TPM_TRANSMIT_UNLOCKED)) mutex_lock(&chip->tpm_mutex); - pm_runtime_get_sync(chip->dev.parent); - rc = chip->ops->send(chip, (u8 *) buf, count); if (rc < 0) { dev_err(&chip->dev, @@ -400,8 +397,6 @@ out_recv: dev_err(&chip->dev, "tpm_transmit: tpm_recv: error %zd\n", rc); out: - pm_runtime_put(chip->dev.parent); - if (!(flags & TPM_TRANSMIT_UNLOCKED)) mutex_unlock(&chip->tpm_mutex); return rc; |