evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ARM: integrator: fix build with INTEGRATOR_AP off

Browse source 
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>
This commit is contained in:
Arnd Bergmann 2013-02-14 13:43:29 +01:00
parent 060fd1be0c
commit a02e0a831f
2 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
arch/arm/mach-integrator/common.h
View file

@ -1,10 +1,5 @@
#include <linux/amba/serial.h> #include <linux/amba/serial.h>
#ifdef CONFIG_ARCH_INTEGRATOR_AP
extern struct amba_pl010_data ap_uart_data; 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); void integrator_init_early(void);
int integrator_init(bool is_cp); int integrator_init(bool is_cp);
void integrator_reserve(void); void integrator_reserve(void);

2
arch/arm/mach-integrator/core.c
View file

@ -71,7 +71,7 @@ int __init integrator_init(bool is_cp)
* hard-code them. The Integator/CP and forward have proper cell IDs. * hard-code them. The Integator/CP and forward have proper cell IDs.
* Else we leave them undefined to the bus driver can autoprobe them. * 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; rtc_device.periphid = 0x00041030;
uart0_device.periphid = 0x00041010; uart0_device.periphid = 0x00041010;
uart1_device.periphid = 0x00041010; uart1_device.periphid = 0x00041010;