tpm: compile out unused code in the PNP and PM cases
authorKent Yoder <key@linux.vnet.ibm.com>
Thu, 9 Aug 2012 14:20:15 +0000 (09:20 -0500)
committerKent Yoder <key@linux.vnet.ibm.com>
Wed, 22 Aug 2012 16:12:03 +0000 (11:12 -0500)
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>
drivers/char/tpm/tpm_tis.c

index c4be3519a587c4fe33c3a14be17ba72e6067d9a0..6bdf2671254f405e03bfcca83cebba4cbae2e50c 100644 (file)
@@ -705,6 +705,7 @@ out_err:
        return rc;
 }
 
+#if defined(CONFIG_PNP) || defined(CONFIG_PM_SLEEP)
 static void tpm_tis_reenable_interrupts(struct tpm_chip *chip)
 {
        u32 intmask;
@@ -725,7 +726,7 @@ static void tpm_tis_reenable_interrupts(struct tpm_chip *chip)
        iowrite32(intmask,
                  chip->vendor.iobase + TPM_INT_ENABLE(chip->vendor.locality));
 }
-
+#endif
 
 #ifdef CONFIG_PNP
 static int __devinit tpm_tis_pnp_init(struct pnp_dev *pnp_dev,