From: thomas.petazzoni@free-electrons.com (Thomas Petazzoni)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] ARM: orion5x: fix mvebu_mbus_dt_init call
Date: Wed, 4 Jun 2014 11:40:06 +0200 [thread overview]
Message-ID: <20140604114006.476cef06@free-electrons.com> (raw)
In-Reply-To: <4280897.V3UkQjotOL@wuerfel>
Dear Arnd Bergmann,
On Wed, 04 Jun 2014 11:06:40 +0200, Arnd Bergmann wrote:
> 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>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> 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?
Yes, I am indeed aware of this change. I think I did a patch to fix it
at some point, but maybe it got lost in the merging process, or simply
I don't remember correctly what happened. It's indeed caused by an
interaction between changes in the mvebu-mbus driver and the conversion
of mach-orion5x to DT. Your patch is the correct solution.
Thanks a lot!
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
next prev parent reply other threads:[~2014-06-04 9:40 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-04 9:06 [PATCH] ARM: orion5x: fix mvebu_mbus_dt_init call Arnd Bergmann
2014-06-04 9:40 ` Thomas Petazzoni [this message]
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=20140604114006.476cef06@free-electrons.com \
--to=thomas.petazzoni@free-electrons.com \
--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