[PATCH] ARM: orion5x: fix mvebu_mbus_dt_init call

Arnd Bergmann arnd at arndb.de
Wed Jun 4 02:06:40 PDT 2014


The prototype for mvebu_mbus_dt_init() changed around the same time
as a new caller was added to orion5x. This adds the missing argument
to make orion5x behave correctly to avoid this build error:

mach-orion5x/board-dt.c: In function 'orion5x_dt_init':
mach-orion5x/board-dt.c:48:2: error: too few arguments to function 'mvebu_mbus_dt_init'
  BUG_ON(mvebu_mbus_dt_init());
  ^
In file included from mach-orion5x/board-dt.c:18:0:
include/linux/mbus.h:76:5: note: declared here
 int mvebu_mbus_dt_init(bool is_coherent);
     ^

Signed-off-by: Arnd Bergmann <arnd at arndb.de>
---
Thomas, I assume you were aware of this problem since you
wrote the two patches that clashed, but for some reason we
screwed it up when merging them into arm-soc. Should we apply
this directly as a bug fix to arm-soc or did you already have
another solution planned?

diff --git a/arch/arm/mach-orion5x/board-dt.c b/arch/arm/mach-orion5x/board-dt.c
index 35d418f..79f033b 100644
--- a/arch/arm/mach-orion5x/board-dt.c
+++ b/arch/arm/mach-orion5x/board-dt.c
@@ -45,7 +45,7 @@ static void __init orion5x_dt_init(void)
 	orion5x_id(&dev, &rev, &dev_name);
 	printk(KERN_INFO "Orion ID: %s. TCLK=%d.\n", dev_name, orion5x_tclk);
 
-	BUG_ON(mvebu_mbus_dt_init());
+	BUG_ON(mvebu_mbus_dt_init(false));
 
 	/*
 	 * Setup Orion address map




More information about the linux-arm-kernel mailing list