* [PATCH] tpm: Fix compilation warning when CONFIG_PNP is not defined
@ 2011-07-17 11:55 Stefan Berger
2011-07-17 17:08 ` Randy Dunlap
2011-07-17 23:16 ` Stephen Rothwell
0 siblings, 2 replies; 5+ messages in thread
From: Stefan Berger @ 2011-07-17 11:55 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
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_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)
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] tpm: Fix compilation warning when CONFIG_PNP is not defined
2011-07-17 11:55 [PATCH] tpm: Fix compilation warning when CONFIG_PNP is not defined Stefan Berger
@ 2011-07-17 17:08 ` Randy Dunlap
2011-07-17 23:16 ` Stephen Rothwell
1 sibling, 0 replies; 5+ messages in thread
From: Randy Dunlap @ 2011-07-17 17:08 UTC (permalink / raw)
To: Stefan Berger
Cc: Rajiv Andrade, linux-kernel@vger.kernel.org, James Morris,
linux-next
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 ***
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] tpm: Fix compilation warning when CONFIG_PNP is not defined
2011-07-17 11:55 [PATCH] tpm: Fix compilation warning when CONFIG_PNP is not defined Stefan Berger
2011-07-17 17:08 ` Randy Dunlap
@ 2011-07-17 23:16 ` Stephen Rothwell
2011-07-18 12:00 ` Stefan Berger
1 sibling, 1 reply; 5+ messages in thread
From: Stephen Rothwell @ 2011-07-17 23:16 UTC (permalink / raw)
To: Stefan Berger
Cc: rdunlap, Rajiv Andrade, linux-kernel@vger.kernel.org,
James Morris, linux-next
[-- Attachment #1: Type: text/plain, Size: 674 bytes --]
Hi Stefan,
On Sun, 17 Jul 2011 07:55:58 -0400 Stefan Berger <stefanb@linux.vnet.ibm.com> wrote:
>
> The is_itpm() function is only accessed from a block surrounded by
> #ifdef CONFIG_PNP. Therefore, also surround it with #ifdef CONFIG_PNP
^^^
> --- 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
^^^^
Is this a typo?
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] tpm: Fix compilation warning when CONFIG_PNP is not defined
2011-07-17 23:16 ` Stephen Rothwell
@ 2011-07-18 12:00 ` Stefan Berger
2011-07-20 0:29 ` James Morris
0 siblings, 1 reply; 5+ messages in thread
From: Stefan Berger @ 2011-07-18 12:00 UTC (permalink / raw)
To: Stephen Rothwell
Cc: rdunlap, Rajiv Andrade, linux-kernel@vger.kernel.org,
James Morris, linux-next
On 07/17/2011 07:16 PM, Stephen Rothwell wrote:
> Hi Stefan,
>
> On Sun, 17 Jul 2011 07:55:58 -0400 Stefan Berger<stefanb@linux.vnet.ibm.com> wrote:
>> The is_itpm() function is only accessed from a block surrounded by
>> #ifdef CONFIG_PNP. Therefore, also surround it with #ifdef CONFIG_PNP
> ^^^
>
>> --- 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
> ^^^^
> Is this a typo?
>
Argh, yes.
Stefan
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] tpm: Fix compilation warning when CONFIG_PNP is not defined
2011-07-18 12:00 ` Stefan Berger
@ 2011-07-20 0:29 ` James Morris
0 siblings, 0 replies; 5+ messages in thread
From: James Morris @ 2011-07-20 0:29 UTC (permalink / raw)
To: Stefan Berger
Cc: Stephen Rothwell, rdunlap, Rajiv Andrade,
linux-kernel@vger.kernel.org, linux-next
On Mon, 18 Jul 2011, Stefan Berger wrote:
> > > -#ifdef CONFIG_ACPI
> > > +#ifdef CONFIG_PNPN
> > ^^^^
> > Is this a typo?
> >
> Argh, yes.
Do you have an updated version?
--
James Morris
<jmorris@namei.org>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-07-20 0:29 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-07-17 11:55 [PATCH] tpm: Fix compilation warning when CONFIG_PNP is not defined Stefan Berger
2011-07-17 17:08 ` Randy Dunlap
2011-07-17 23:16 ` Stephen Rothwell
2011-07-18 12:00 ` Stefan Berger
2011-07-20 0:29 ` James Morris
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).