diff options
author | Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> | 2016-02-22 09:09:12 -0500 |
---|---|---|
committer | Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> | 2016-02-26 04:32:07 -0500 |
commit | 2cb6d6460f1a171c71c134e0efe3a94c2206d080 (patch) | |
tree | 4382e1b5a153fc2492a55d5b1c0178eec74a659c /drivers/char | |
parent | 481873d06f2bf2ad732450a3a5fa5b8c2a07ef88 (diff) |
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
Diffstat (limited to 'drivers/char')
-rw-r--r-- | drivers/char/tpm/tpm_tis.c | 2 |
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: | |||
814 | return rc; | 814 | return rc; |
815 | } | 815 | } |
816 | 816 | ||
817 | #ifdef CONFIG_PM_SLEEP | ||
817 | static void tpm_tis_reenable_interrupts(struct tpm_chip *chip) | 818 | static void tpm_tis_reenable_interrupts(struct tpm_chip *chip) |
818 | { | 819 | { |
819 | u32 intmask; | 820 | u32 intmask; |
@@ -855,6 +856,7 @@ static int tpm_tis_resume(struct device *dev) | |||
855 | 856 | ||
856 | return 0; | 857 | return 0; |
857 | } | 858 | } |
859 | #endif | ||
858 | 860 | ||
859 | static SIMPLE_DEV_PM_OPS(tpm_tis_pm, tpm_pm_suspend, tpm_tis_resume); | 861 | static SIMPLE_DEV_PM_OPS(tpm_tis_pm, tpm_pm_suspend, tpm_tis_resume); |
860 | 862 | ||