[PATCH v2] tpm: Fix compilation warning when CONFIG_PNP is notdefined

From: Stefan Berger
Date: Tue Jul 19 2011 - 21:09:30 EST

The is_itpm() function is only accessed from a block surrounded by
#ifdef CONFIG_PNP. Therefore, also surround it with #ifdef CONFIG_PNP
and remove the #else branch causing the warning.


- fixes a previous typo

Signed-off-by: Stefan Berger <stefanb@xxxxxxxxxxxxxxxxxx>

drivers/char/tpm/tpm_tis.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)

Index: linux-2.6/drivers/char/tpm/tpm_tis.c
--- linux-2.6.orig/drivers/char/tpm/tpm_tis.c
+++ linux-2.6/drivers/char/tpm/tpm_tis.c
@@ -80,7 +80,7 @@ enum tis_defaults {
static LIST_HEAD(tis_chips);
static DEFINE_SPINLOCK(tis_lock);

+#ifdef CONFIG_PNP
static int is_itpm(struct pnp_dev *dev)
struct acpi_device *acpi = pnp_acpi_device(dev);
@@ -93,11 +93,6 @@ static int is_itpm(struct pnp_dev *dev)

return 0;
-static int is_itpm(struct pnp_dev *dev)
- return 0;

static int check_locality(struct tpm_chip *chip, int l)

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/