lkml.org 
[lkml]   [2011]   [Jul]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] tpm: Fix compilation warning when CONFIG_PNP is not defined
On Sun, 17 Jul 2011 07:55:58 -0400 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
>
> Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>

Reported-by: Randy Dunlap <rdunlap@xenotime.net>
Acked-by: Randy Dunlap <rdunlap@xenotime.net>

Thanks.

>
> ---
> 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)
>


---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***

\
 
 \ /
  Last update: 2011-07-17 19:11    [from the cache]
©2003-2014 Jasper Spaans. hosted at Digital Ocean