linux-kernel - [PATCH] MIPS: ath79: fix compilation error when CONFIG

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:	Sun, 19 Oct 2014 19:43:14 +0200
From:	Stefan Hengelein <stefan.hengelein@....de>
To:	linux-mips@...ux-mips.org
Cc:	linux-kernel@...r.kernel.org, ralf@...ux-mips.org,
	Stefan Hengelein <stefan.hengelein@....de>
Subject: [PATCH] MIPS: ath79: fix compilation error when CONFIG_PCI is disabled

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'

Signed-off-by: Stefan Hengelein <stefan.hengelein@....de>
---
 arch/mips/ath79/mach-db120.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/mips/ath79/mach-db120.c b/arch/mips/ath79/mach-db120.c
index 4d661a1..d1a783d 100644
--- a/arch/mips/ath79/mach-db120.c
+++ b/arch/mips/ath79/mach-db120.c
@@ -112,8 +112,6 @@ static void __init db120_pci_init(u8 *eeprom)
 	ath79_pci_set_plat_dev_init(db120_pci_plat_dev_init);
 	ath79_register_pci();
 }
-#else
-static inline void db120_pci_init(void) {}
 #endif /* CONFIG_PCI */
 
 static void __init db120_setup(void)
@@ -129,7 +127,9 @@ static void __init db120_setup(void)
 			   ARRAY_SIZE(db120_spi_info));
 	ath79_register_usb();
 	ath79_register_wmac(art + DB120_WMAC_CALDATA_OFFSET);
+#ifdef CONFIG_PCI
 	db120_pci_init(art + DB120_PCIE_CALDATA_OFFSET);
+#endif
 }
 
 MIPS_MACHINE(ATH79_MACH_DB120, "DB120", "Atheros DB120 reference board",
-- 
1.9.1

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