Re: [PATCH] tpm: Move tpm_tis_reenable_interrupts out of CONFIG_PNPblock

[Stefan Berger]

On 07/17/2011 07:53 AM, Harry Wei wrote:
> On Sat, Jul 16, 2011 at 10:34:26PM -0700, Randy Dunlap wrote:
>> New warning:
>> drivers/char/tpm/tpm_tis.c:97: warning: 'is_itpm' defined but not used
> From: Harry Wei <harryxiyou@xxxxxxxxx>
>
> This patch can fix above warning.
>
> Reported-by: Randy Dunlap <rdunlap@xxxxxxxxxxxx>
> Signed-off-by: Harry Wei <harryxiyou@xxxxxxxxx>
> ---
>  drivers/char/tpm/tpm_tis.c |   20 --------------------
>  1 files changed, 0 insertions(+), 20 deletions(-)
>
> diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c
> index dd21df5..5929bb2 100644
> --- a/drivers/char/tpm/tpm_tis.c
> +++ b/drivers/char/tpm/tpm_tis.c
> @@ -79,26 +79,6 @@ enum tis_defaults {
>  static LIST_HEAD(tis_chips);
>  static DEFINE_SPINLOCK(tis_lock);
>
> -#ifdef CONFIG_ACPI
> -static int is_itpm(struct pnp_dev *dev)
> -{
> -	struct acpi_device *acpi = pnp_acpi_device(dev);
> -	struct acpi_hardware_id *id;
> -
> -	list_for_each_entry(id, &acpi->pnp.ids, list) {
> -		if (!strcmp("INTC0102", id->id))
> -			return 1;
> -	}
> -
> -	return 0;
> -}
> -#else
> -static int is_itpm(struct pnp_dev *dev)
> -{
> -	return 0;
> -}
> -#endif
> -
>  static int check_locality(struct tpm_chip *chip, int l)
>  {
>  	if ((ioread8(chip->vendor.iobase + TPM_ACCESS(l)) &
It's not dead code. You'll get a compiler error once CONFIG_PNP is
enabled. NACK.

Stefan


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/