From: Arnd Bergmann <arnd@arndb.de>
To: arm@kernel.org
Cc: linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
Russell King <linux@arm.linux.org.uk>,
Arnd Bergmann <arnd@arndb.de>,
Linus Walleij <linus.walleij@linaro.org>
Subject: [PATCH 07/11] ARM: integrator: fix build with INTEGRATOR_AP off
Date: Thu, 14 Feb 2013 14:49:23 +0100 [thread overview]
Message-ID: <1360849767-1463135-8-git-send-email-arnd@arndb.de> (raw)
In-Reply-To: <1360849767-1463135-1-git-send-email-arnd@arndb.de>
The conditional declaration of ap_uart_data is broken
and causes this build error:
In file included from arch/arm/mach-integrator/core.c:35:0:
arch/arm/mach-integrator/common.h:6:37: error: expected '=', ',', ';', 'asm' or '__attribute__' before '{' token
Turning the check into an constant-expression if(IS_ENABLED()) statement
creates more readable code and solves this problem as well.
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Russell King <linux@arm.linux.org.uk>
---
arch/arm/mach-integrator/common.h | 5 -----
arch/arm/mach-integrator/core.c | 2 +-
2 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/arch/arm/mach-integrator/common.h b/arch/arm/mach-integrator/common.h
index 79197d8..72516658b 100644
--- a/arch/arm/mach-integrator/common.h
+++ b/arch/arm/mach-integrator/common.h
@@ -1,10 +1,5 @@
#include <linux/amba/serial.h>
-#ifdef CONFIG_ARCH_INTEGRATOR_AP
extern struct amba_pl010_data ap_uart_data;
-#else
-/* Not used without Integrator/AP support anyway */
-struct amba_pl010_data ap_uart_data {};
-#endif
void integrator_init_early(void);
int integrator_init(bool is_cp);
void integrator_reserve(void);
diff --git a/arch/arm/mach-integrator/core.c b/arch/arm/mach-integrator/core.c
index 39c060f..81461d2 100644
--- a/arch/arm/mach-integrator/core.c
+++ b/arch/arm/mach-integrator/core.c
@@ -71,7 +71,7 @@ int __init integrator_init(bool is_cp)
* hard-code them. The Integator/CP and forward have proper cell IDs.
* Else we leave them undefined to the bus driver can autoprobe them.
*/
- if (!is_cp) {
+ if (!is_cp && IS_ENABLED(CONFIG_ARCH_INTEGRATOR_AP)) {
rtc_device.periphid = 0x00041030;
uart0_device.periphid = 0x00041010;
uart1_device.periphid = 0x00041010;
--
1.8.1.2
next prev parent reply other threads:[~2013-02-14 13:49 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-14 13:49 [PATCH 00/11] ARM warning fixes for arm-soc Arnd Bergmann
2013-02-14 13:49 ` [PATCH 01/11] ARM: disable virt_to_bus/virt_to_bus almost everywhere Arnd Bergmann
2013-02-16 22:18 ` Emilio López
2013-02-16 23:15 ` Arnd Bergmann
2013-02-20 15:14 ` James Hogan
2013-02-20 16:00 ` Arnd Bergmann
2013-02-20 16:32 ` James Hogan
2013-02-21 7:37 ` Vineet Gupta
2013-02-21 23:13 ` Stephen Rothwell
2013-02-25 14:18 ` Vineet Gupta
2013-02-25 14:54 ` Arnd Bergmann
2013-02-14 13:49 ` [PATCH 02/11] ARM: samsung: fix assembly syntax for new gas Arnd Bergmann
2013-02-16 23:25 ` Russell King - ARM Linux
2013-02-17 14:01 ` Arnd Bergmann
2013-02-17 15:37 ` Mikael Pettersson
2013-02-17 15:47 ` Arnd Bergmann
2013-02-17 0:38 ` Aaro Koskinen
2013-02-17 15:37 ` Arnd Bergmann
2013-02-14 13:49 ` [PATCH 03/11] ARM: w90x900: fix legacy assembly syntax Arnd Bergmann
2013-02-14 13:49 ` [PATCH 04/11] ARM: shmobile: fix defconfig warning on CONFIG_USB Arnd Bergmann
2013-02-14 13:49 ` [PATCH 05/11] ARM: sa1100: don't warn about mach/ide.h Arnd Bergmann
2013-02-14 13:49 ` [PATCH 06/11] ARM: integrator/versatile: fix NOMMU warnings Arnd Bergmann
2013-02-15 9:12 ` Linus Walleij
2013-02-14 13:49 ` Arnd Bergmann [this message]
2013-02-15 9:13 ` [PATCH 07/11] ARM: integrator: fix build with INTEGRATOR_AP off Linus Walleij
2013-02-14 13:49 ` [PATCH 08/11] ARM: pick Versatile by default for !MMU Arnd Bergmann
2013-02-14 13:49 ` [PATCH 09/11] ARM: mvebu: allow selecting mvebu without Armada XP Arnd Bergmann
2013-02-14 13:49 ` [PATCH 10/11] ARM: s3c: i2c: add platform_device forward declaration Arnd Bergmann
2013-02-15 11:54 ` Wolfram Sang
2013-02-14 13:49 ` [PATCH 11/11] scripts/sortextable: silence script output Arnd Bergmann
2013-02-14 19:25 ` H. Peter Anvin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1360849767-1463135-8-git-send-email-arnd@arndb.de \
--to=arnd@arndb.de \
--cc=arm@kernel.org \
--cc=linus.walleij@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®