diff options
author | Kent Yoder <key@linux.vnet.ibm.com> | 2012-08-09 10:20:15 -0400 |
---|---|---|
committer | Kent Yoder <key@linux.vnet.ibm.com> | 2012-08-22 12:12:03 -0400 |
commit | 7e72fe73bfc7e4219b8dd212026c7113f4e37f91 (patch) | |
tree | 5c6af208990e86fc9e0c88ae7f05496dec1e8a87 /drivers/char | |
parent | dd7da132f7f04f34074efd134847a818ea29ddd7 (diff) |
tpm: compile out unused code in the PNP and PM cases
The tpm_tis driver doesn't use tpm_tis_resume except when PM is
configured and doesn't make use of tpm_tis_reenable_interrupts except
when PM or PNP is configured.
Signed-off-by: Kent Yoder <key@linux.vnet.ibm.com>
Diffstat (limited to 'drivers/char')
-rw-r--r-- | drivers/char/tpm/tpm_tis.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c index c4be3519a587..6bdf2671254f 100644 --- a/drivers/char/tpm/tpm_tis.c +++ b/drivers/char/tpm/tpm_tis.c | |||
@@ -705,6 +705,7 @@ out_err: | |||
705 | return rc; | 705 | return rc; |
706 | } | 706 | } |
707 | 707 | ||
708 | #if defined(CONFIG_PNP) || defined(CONFIG_PM_SLEEP) | ||
708 | static void tpm_tis_reenable_interrupts(struct tpm_chip *chip) | 709 | static void tpm_tis_reenable_interrupts(struct tpm_chip *chip) |
709 | { | 710 | { |
710 | u32 intmask; | 711 | u32 intmask; |
@@ -725,7 +726,7 @@ static void tpm_tis_reenable_interrupts(struct tpm_chip *chip) | |||
725 | iowrite32(intmask, | 726 | iowrite32(intmask, |
726 | chip->vendor.iobase + TPM_INT_ENABLE(chip->vendor.locality)); | 727 | chip->vendor.iobase + TPM_INT_ENABLE(chip->vendor.locality)); |
727 | } | 728 | } |
728 | 729 | #endif | |
729 | 730 | ||
730 | #ifdef CONFIG_PNP | 731 | #ifdef CONFIG_PNP |
731 | static int __devinit tpm_tis_pnp_init(struct pnp_dev *pnp_dev, | 732 | static int __devinit tpm_tis_pnp_init(struct pnp_dev *pnp_dev, |