From mboxrd@z Thu Jan 1 00:00:00 1970 Received: with ECARTIS (v1.0.0; list linux-mips); Mon, 20 Oct 2014 15:19:28 +0200 (CEST) Received: from mailapp01.imgtec.com ([195.59.15.196]:47597 "EHLO mailapp01.imgtec.com" rhost-flags-OK-OK-OK-OK) by eddie.linux-mips.org with ESMTP id S27011798AbaJTNT0Re1oA (ORCPT ); Mon, 20 Oct 2014 15:19:26 +0200 Received: from KLMAIL01.kl.imgtec.org (unknown [192.168.5.35]) by Websense Email Security Gateway with ESMTPS id 1E61E2D689F02 for ; Mon, 20 Oct 2014 14:19:17 +0100 (IST) Received: from KLMAIL02.kl.imgtec.org (10.40.60.222) by KLMAIL01.kl.imgtec.org (192.168.5.35) with Microsoft SMTP Server (TLS) id 14.3.195.1; Mon, 20 Oct 2014 14:19:19 +0100 Received: from LEMAIL01.le.imgtec.org (192.168.152.62) by klmail02.kl.imgtec.org (10.40.60.222) with Microsoft SMTP Server (TLS) id 14.3.195.1; Mon, 20 Oct 2014 14:19:19 +0100 Received: from [192.168.154.141] (192.168.154.141) by LEMAIL01.le.imgtec.org (192.168.152.62) with Microsoft SMTP Server (TLS) id 14.3.195.1; Mon, 20 Oct 2014 14:19:18 +0100 Message-ID: <54450BD6.1000806@imgtec.com> Date: Mon, 20 Oct 2014 14:19:18 +0100 From: Markos Chandras User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.2.0 MIME-Version: 1.0 To: Subject: Re: [PATCH] MIPS: ath79: fix compilation error when CONFIG_PCI is disabled References: <1413810699-44465-1-git-send-email-stefan.hengelein@fau.de> In-Reply-To: <1413810699-44465-1-git-send-email-stefan.hengelein@fau.de> Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: 7bit X-Originating-IP: [192.168.154.141] Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 43352 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: Markos.Chandras@imgtec.com Precedence: bulk List-help: List-unsubscribe: List-software: Ecartis version 1.0.0 List-Id: linux-mips X-List-ID: linux-mips List-subscribe: List-owner: List-post: List-archive: X-list: linux-mips On 10/20/2014 02:11 PM, Stefan Hengelein wrote: > When CONFIG_PCI is disabled, 'db120_pci_init()' had a different > signature than when was enabled. Therefore, compilation failed when > CONFIG_PCI was not present. > > arch/mips/ath79/mach-db120.c:132: error: too many arguments to function 'db120_pci_init' > > This error was found with vampyr. > > Signed-off-by: Stefan Hengelein > > --- > Changelog: > v2: fix prototype instead of removing the caller > --- > arch/mips/ath79/mach-db120.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/mips/ath79/mach-db120.c b/arch/mips/ath79/mach-db120.c > index 4d661a1..9423f5a 100644 > --- a/arch/mips/ath79/mach-db120.c > +++ b/arch/mips/ath79/mach-db120.c > @@ -113,7 +113,7 @@ static void __init db120_pci_init(u8 *eeprom) > ath79_register_pci(); > } > #else > -static inline void db120_pci_init(void) {} > +static inline void db120_pci_init(u8 *eeprom) {} > #endif /* CONFIG_PCI */ > > static void __init db120_setup(void) > Reviewed-by: Markos Chandras -- markos From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailapp01.imgtec.com ([195.59.15.196]:47597 "EHLO mailapp01.imgtec.com" rhost-flags-OK-OK-OK-OK) by eddie.linux-mips.org with ESMTP id S27011798AbaJTNT0Re1oA (ORCPT ); Mon, 20 Oct 2014 15:19:26 +0200 Received: from KLMAIL01.kl.imgtec.org (unknown [192.168.5.35]) by Websense Email Security Gateway with ESMTPS id 1E61E2D689F02 for ; Mon, 20 Oct 2014 14:19:17 +0100 (IST) Message-ID: <54450BD6.1000806@imgtec.com> Date: Mon, 20 Oct 2014 14:19:18 +0100 From: Markos Chandras MIME-Version: 1.0 Subject: Re: [PATCH] MIPS: ath79: fix compilation error when CONFIG_PCI is disabled References: <1413810699-44465-1-git-send-email-stefan.hengelein@fau.de> In-Reply-To: <1413810699-44465-1-git-send-email-stefan.hengelein@fau.de> Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: 7bit Return-Path: Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org List-help: List-unsubscribe: List-software: Ecartis version 1.0.0 List-subscribe: List-owner: List-post: List-archive: To: linux-mips@linux-mips.org Message-ID: <20141020131918.VPvZ_yNmM2VeCYQ52El8Pc61lavre9t9jMS5UCUKJDQ@z> On 10/20/2014 02:11 PM, Stefan Hengelein wrote: > When CONFIG_PCI is disabled, 'db120_pci_init()' had a different > signature than when was enabled. Therefore, compilation failed when > CONFIG_PCI was not present. > > arch/mips/ath79/mach-db120.c:132: error: too many arguments to function 'db120_pci_init' > > This error was found with vampyr. > > Signed-off-by: Stefan Hengelein > > --- > Changelog: > v2: fix prototype instead of removing the caller > --- > arch/mips/ath79/mach-db120.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/mips/ath79/mach-db120.c b/arch/mips/ath79/mach-db120.c > index 4d661a1..9423f5a 100644 > --- a/arch/mips/ath79/mach-db120.c > +++ b/arch/mips/ath79/mach-db120.c > @@ -113,7 +113,7 @@ static void __init db120_pci_init(u8 *eeprom) > ath79_register_pci(); > } > #else > -static inline void db120_pci_init(void) {} > +static inline void db120_pci_init(u8 *eeprom) {} > #endif /* CONFIG_PCI */ > > static void __init db120_setup(void) > Reviewed-by: Markos Chandras -- markos