From: arnd@arndb.de (Arnd Bergmann)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] ARM: orion5x: fix mvebu_mbus_dt_init call
Date: Wed, 04 Jun 2014 11:06:40 +0200 [thread overview]
Message-ID: <4280897.V3UkQjotOL@wuerfel> (raw)
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@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
next reply other threads:[~2014-06-04 9:06 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-04 9:06 Arnd Bergmann [this message]
2014-06-04 9:40 ` [PATCH] ARM: orion5x: fix mvebu_mbus_dt_init call Thomas Petazzoni
2014-06-04 10:36 ` Arnd Bergmann
2014-06-04 13:45 ` Jason Cooper
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=4280897.V3UkQjotOL@wuerfel \
--to=arnd@arndb.de \
--cc=linux-arm-kernel@lists.infradead.org \
/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