tpm: compile out unused code in the PNP and PM cases

Kent Yoder · Kent Yoder · commit 7e72fe73bfc7 · 2012-08-22T11:12:03.000-05:00
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 &lt;key@linux.vnet.ibm.com&gt;
diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c
@@ -705,6 +705,7 @@ static int tpm_tis_init(struct device *dev, resource_size_t start,
 	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,

Original file line number	Diff line number	Diff line change
`@@ -705,6 +705,7 @@ static int tpm_tis_init(struct device *dev, resource_size_t start,`
`705`	`705`	`return rc;`
`706`	`706`	`}`
`707`	`707`
	`708`	`+#if defined(CONFIG_PNP) \|\| defined(CONFIG_PM_SLEEP)`
`708`	`709`	`static void tpm_tis_reenable_interrupts(struct tpm_chip *chip)`
`709`	`710`	`{`
`710`	`711`	`u32 intmask;`
`@@ -725,7 +726,7 @@ static void tpm_tis_reenable_interrupts(struct tpm_chip *chip)`
`725`	`726`	`iowrite32(intmask,`
`726`	`727`	`chip->vendor.iobase + TPM_INT_ENABLE(chip->vendor.locality));`
`727`	`728`	`}`
`728`		`-`
	`729`	`+#endif`
`729`	`730`
`730`	`731`	`#ifdef CONFIG_PNP`
`731`	`732`	`static int __devinit tpm_tis_pnp_init(struct pnp_dev *pnp_dev,`