From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: linux-next: build failure after merge of the tpmdd tree Date: Wed, 10 May 2017 13:23:27 +1000 Message-ID: <20170510132327.599ddc02@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-path: Received: from ozlabs.org ([103.22.144.67]:59473 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751177AbdEJDXa (ORCPT ); Tue, 9 May 2017 23:23:30 -0400 Sender: linux-next-owner@vger.kernel.org List-ID: To: Jarkko Sakkinen Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Jason Gunthorpe 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 Date: Wed, 10 May 2017 13:15:35 +1000 Subject: [PATCH] tpm_tis: fixup for CONFIG_ACPI not set Signed-off-by: Stephen Rothwell --- 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