summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>2016-02-22 17:09:12 +0300
committerJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>2016-02-26 12:32:07 +0300
commit2cb6d6460f1a171c71c134e0efe3a94c2206d080 (patch)
tree4382e1b5a153fc2492a55d5b1c0178eec74a659c
parent481873d06f2bf2ad732450a3a5fa5b8c2a07ef88 (diff)
downloadlinux-2cb6d6460f1a171c71c134e0efe3a94c2206d080.tar.xz
tpm_tis: fix build warning with tpm_tis_resume
drivers/char/tpm/tpm_tis.c:838: warning: ‘tpm_tis_resume’ defined but not used Reported-by: James Morris <jmorris@namei.org> Fixes: 00194826e6be ("tpm_tis: Clean up the force=1 module parameter") Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> cc: stable@vger.kernel.org
-rw-r--r--drivers/char/tpm/tpm_tis.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c
index 2b2eff9e769e..a507006728e0 100644
--- a/drivers/char/tpm/tpm_tis.c
+++ b/drivers/char/tpm/tpm_tis.c
@@ -814,6 +814,7 @@ out_err:
return rc;
}
+#ifdef CONFIG_PM_SLEEP
static void tpm_tis_reenable_interrupts(struct tpm_chip *chip)
{
u32 intmask;
@@ -855,6 +856,7 @@ static int tpm_tis_resume(struct device *dev)
return 0;
}
+#endif
static SIMPLE_DEV_PM_OPS(tpm_tis_pm, tpm_pm_suspend, tpm_tis_resume);