* [PATCH v2] tpm: Fix compilation warning when CONFIG_PNP is not defined
@ 2011-07-18 13:11 Stefan Berger
2011-07-20 23:31 ` James Morris
0 siblings, 1 reply; 2+ messages in thread
From: Stefan Berger @ 2011-07-18 13:11 UTC (permalink / raw)
To: rdunlap, Rajiv Andrade
Cc: linux-kernel@vger.kernel.org, James Morris, linux-next
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
v2:
- fixes a previous typo
Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
---
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_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;
}
-#else
-static int is_itpm(struct pnp_dev *dev)
-{
- return 0;
-}
#endif
static int check_locality(struct tpm_chip *chip, int l)
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH v2] tpm: Fix compilation warning when CONFIG_PNP is not defined
2011-07-18 13:11 [PATCH v2] tpm: Fix compilation warning when CONFIG_PNP is not defined Stefan Berger
@ 2011-07-20 23:31 ` James Morris
0 siblings, 0 replies; 2+ messages in thread
From: James Morris @ 2011-07-20 23:31 UTC (permalink / raw)
To: Stefan Berger
Cc: rdunlap, Rajiv Andrade, linux-kernel@vger.kernel.org, linux-next
On Mon, 18 Jul 2011, Stefan Berger wrote:
> 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
>
> v2:
> - fixes a previous typo
Applied to
git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6#next
--
James Morris
<jmorris@namei.org>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-07-20 23:31 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-07-18 13:11 [PATCH v2] tpm: Fix compilation warning when CONFIG_PNP is not defined Stefan Berger
2011-07-20 23:31 ` James Morris
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox