From: Randy Dunlap <rdunlap@xenotime•net>
To: Stefan Berger <stefanb@linux•vnet.ibm.com>
Cc: Rajiv Andrade <srajiv@linux•vnet.ibm.com>,
"linux-kernel@vger•kernel.org" <linux-kernel@vger•kernel.org>,
James Morris <jmorris@namei•org>,
linux-next@vger•kernel.org
Subject: Re: [PATCH] tpm: Fix compilation warning when CONFIG_PNP is not defined
Date: Sun, 17 Jul 2011 10:08:07 -0700 [thread overview]
Message-ID: <20110717100807.97637264.rdunlap@xenotime.net> (raw)
In-Reply-To: <1310903758.15064.9.camel@d941e-10>
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 ***
next prev parent reply other threads:[~2011-07-17 17:08 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
2011-07-17 23:16 ` Stephen Rothwell
2011-07-18 12:00 ` Stefan Berger
2011-07-20 0:29 ` James Morris
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110717100807.97637264.rdunlap@xenotime.net \
--to=rdunlap@xenotime$(echo .)net \
--cc=jmorris@namei$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=srajiv@linux$(echo .)vnet.ibm.com \
--cc=stefanb@linux$(echo .)vnet.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox