lkml.org 
[lkml]   [2017]   [May]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: build failure after merge of the tpmdd tree
Hi

On Wed, May 10, 2017 at 01:23:27PM +1000, Stephen Rothwell wrote:
> Hi Jarkko,
>
> After merging the tpmdd tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
>
> drivers/char/tpm/tpm_tis.c: In function 'tpm_tis_init':
> drivers/char/tpm/tpm_tis.c:193:23: error: passing argument 1 of 'check_acpi_tpm2' from incompatible pointer type [-Werror=incompatible-pointer-types]
> rc = check_acpi_tpm2(dev);
> ^
> drivers/char/tpm/tpm_tis.c:129:12: note: expected 'struct acpi_device *' but argument is of type 'struct device *'
> static int check_acpi_tpm2(struct acpi_device *dev)
> ^
>
> Caused by commit
>
> e3b975d27b46 ("tpm_tis: Consolidate the platform and acpi probe flow")
>
> CONFIG_ACPI is not set for this build.
>
> I have added the following patch for today.
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 10 May 2017 13:15:35 +1000
> Subject: [PATCH] tpm_tis: fixup for CONFIG_ACPI not set
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> drivers/char/tpm/tpm_tis.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c
> index 54d90e31a7b6..b14d4aa97af8 100644
> --- a/drivers/char/tpm/tpm_tis.c
> +++ b/drivers/char/tpm/tpm_tis.c
> @@ -126,7 +126,7 @@ static int check_acpi_tpm2(struct device *dev)
> return 0;
> }
> #else
> -static int check_acpi_tpm2(struct acpi_device *dev)
> +static int check_acpi_tpm2(struct device *dev)
> {
> return 0;
> }
> --
> 2.11.0
>
> --
> Cheers,
> Stephen Rothwell

Thank you! I'll squash this.

/Jarkko

\
 
 \ /
  Last update: 2017-05-10 21:21    [W:0.028 / U:12.448 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site