Skip to contentSkip to conversation

ARM: bcmring: fix build error due to bad AMBA_APB_DEVICE init

PATCH New Olof Johansson 2 participants 2 messages Apr 16, 2012

Subsystems (2)
Arm (32-bit) Arm sub-architectures
lore
Share & tools
lore

Olof Johansson

author
#0 lore raw

PATCH 1/1 ARM: bcmring: fix build error due to bad AMBA_APB_DEVICE init

Seems to have been introduced by:
8ede1ae65 ARM: amba: bcmring: use common amba device initializers

'id' is the missing parameter, and with the old initializer the value used was 0. Use the same here.

arch/arm/mach-bcmring/core.c:55:77: error: macro "AMBA_APB_DEVICE" requires 6 arguments, but only 5 given arch/arm/mach-bcmring/core.c:55:8: warning: type defaults to 'int' in declaration of 'AMBA_APB_DEVICE' [-Wimplicit-int] arch/arm/mach-bcmring/core.c:56:77: error: macro "AMBA_APB_DEVICE" requires 6 arguments, but only 5 given arch/arm/mach-bcmring/core.c:56:8: warning: type defaults to 'int' in declaration of 'AMBA_APB_DEVICE' [-Wimplicit-int]

Signed-off-by Olof Johansson <[email protected]>
Cc Russell King <[email protected]>
Cc Jiandong Zheng <[email protected]>
---
 arch/arm/mach-bcmring/core.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/mach-bcmring/core.c +2 -2
index 22e4e0a..56d8b0f 100644
@@ -52,8 +52,8 @@
 #include <mach/csp/chipcHw_inline.h>
 #include <mach/csp/tmrHw_reg.h>
 
-static AMBA_APB_DEVICE(uartA, "uarta", MM_ADDR_IO_UARTA, { IRQ_UARTA }, NULL);
-static AMBA_APB_DEVICE(uartB, "uartb", MM_ADDR_IO_UARTB, { IRQ_UARTB }, NULL);
+static AMBA_APB_DEVICE(uartA, "uarta", 0, MM_ADDR_IO_UARTA, { IRQ_UARTA }, NULL);
+static AMBA_APB_DEVICE(uartB, "uartb", 0, MM_ADDR_IO_UARTB, { IRQ_UARTB }, NULL);
 
 static struct clk pll1_clk = {
 	.name = "PLL1",
Signature · 1 line
1.7.9.2.359.gebfc2
#1 lore raw

PATCH 1/1 ARM: bcmring: fix build error due to bad AMBA_APB_DEVICE init

Quoted 23 lines · Olof Johansson

Seems to have been introduced by:
8ede1ae65 ARM: amba: bcmring: use common amba device initializers

'id' is the missing parameter, and with the old initializer the value used was 0. Use the same here.

arch/arm/mach-bcmring/core.c:55:77: error: macro "AMBA_APB_DEVICE" requires 6 arguments, but only 5 given arch/arm/mach-bcmring/core.c:55:8: warning: type defaults to 'int' in declaration of 'AMBA_APB_DEVICE' [-Wimplicit-int] arch/arm/mach-bcmring/core.c:56:77: error: macro "AMBA_APB_DEVICE" requires 6 arguments, but only 5 given arch/arm/mach-bcmring/core.c:56:8: warning: type defaults to 'int' in declaration of 'AMBA_APB_DEVICE' [-Wimplicit-int]

Signed-off-by Olof Johansson<[email protected]>
Cc Russell King<[email protected]>
Cc Jiandong Zheng<[email protected]>
---
  arch/arm/mach-bcmring/core.c |    4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/mach-bcmring/core.c +0 -0
index 22e4e0a..56d8b0f 100644

arch/arm/mach-bcmring/core.c line 59

Quoted 10 lines
arch/arm/mach-bcmring/core.c +2 -2
@@ -52,8 +52,8 @@
  #include<mach/csp/chipcHw_inline.h>
  #include<mach/csp/tmrHw_reg.h>
 
-static AMBA_APB_DEVICE(uartA, "uarta", MM_ADDR_IO_UARTA, { IRQ_UARTA }, NULL);
-static AMBA_APB_DEVICE(uartB, "uartb", MM_ADDR_IO_UARTB, { IRQ_UARTB }, NULL);
+static AMBA_APB_DEVICE(uartA, "uarta", 0, MM_ADDR_IO_UARTA, { IRQ_UARTA }, NULL);
+static AMBA_APB_DEVICE(uartB, "uartb", 0, MM_ADDR_IO_UARTB, { IRQ_UARTB }, NULL);
 
  static struct clk pll1_clk = {
  	.name = "PLL1",
Acked-by Jiandong Zheng <[email protected]>