From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755653Ab1GQL5w (ORCPT ); Sun, 17 Jul 2011 07:57:52 -0400 Received: from e5.ny.us.ibm.com ([32.97.182.145]:34426 "EHLO e5.ny.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751490Ab1GQL5t (ORCPT ); Sun, 17 Jul 2011 07:57:49 -0400 Subject: [PATCH] tpm: Fix compilation warning when CONFIG_PNP is not defined From: Stefan Berger To: rdunlap@xenotime.net, Rajiv Andrade Cc: "linux-kernel@vger.kernel.org" , James Morris , linux-next@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Date: Sun, 17 Jul 2011 07:55:58 -0400 Message-ID: <1310903758.15064.9.camel@d941e-10> Mime-Version: 1.0 X-Mailer: Evolution 2.32.2 (2.32.2-1.fc14) Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. http://lxr.linux.no/#linux+v2.6.39/drivers/char/tpm/tpm_tis.c#L622 Signed-off-by: Stefan Berger --- 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_ACPI +#ifdef CONFIG_PNPN 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; } -#else -static int is_itpm(struct pnp_dev *dev) -{ - return 0; -} #endif static int check_locality(struct tpm_chip *chip, int l)