[PATCHv2] msm: boards: Fix fallout from removal of machine_desc in fixup

[PATCHv2] msm: boards: Fix fallout from removal of machine_desc in fixup

[Stephen Boyd]

After 0744a3ee (ARM: platform fixups: remove mdesc argument to
fixup function, 2010-12-20) the fixup functions introduced in
9e775ad (ARM: 7012/1: Set proper TEXT_OFFSET for newer MSMs,
2011-08-12) cause warnings like:

arch/arm/mach-msm/board-msm8x60.c:85: warning: initialization
from incompatible pointer type

Fix them by removing the machine_desc argument from the fixup
functions.

Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
---

I sent this a few weeks back. Looks like it was dropped though and
now the merge window is open and Linus' tree fails to boot on these
boards.

 arch/arm/mach-msm/board-msm7x30.c |    4 ++--
 arch/arm/mach-msm/board-msm8960.c |    4 ++--
 arch/arm/mach-msm/board-msm8x60.c |    4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/arm/mach-msm/board-msm7x30.c b/arch/arm/mach-msm/board-msm7x30.c
index d1e4cc8..7a0af9f 100644
--- a/arch/arm/mach-msm/board-msm7x30.c
+++ b/arch/arm/mach-msm/board-msm7x30.c
@@ -43,8 +43,8 @@
 
 extern struct sys_timer msm_timer;
 
-static void __init msm7x30_fixup(struct machine_desc *desc, struct tag *tag,
-			 char **cmdline, struct meminfo *mi)
+static void __init msm7x30_fixup(struct tag *tag, char **cmdline,
+		struct meminfo *mi)
 {
 	for (; tag->hdr.size; tag = tag_next(tag))
 		if (tag->hdr.tag == ATAG_MEM && tag->u.mem.start == 0x200000) {
diff --git a/arch/arm/mach-msm/board-msm8960.c b/arch/arm/mach-msm/board-msm8960.c
index b04468e..6dc1cbd 100644
--- a/arch/arm/mach-msm/board-msm8960.c
+++ b/arch/arm/mach-msm/board-msm8960.c
@@ -32,8 +32,8 @@
 
 #include "devices.h"
 
-static void __init msm8960_fixup(struct machine_desc *desc, struct tag *tag,
-			 char **cmdline, struct meminfo *mi)
+static void __init msm8960_fixup(struct tag *tag, char **cmdline,
+		struct meminfo *mi)
 {
 	for (; tag->hdr.size; tag = tag_next(tag))
 		if (tag->hdr.tag == ATAG_MEM &&
diff --git a/arch/arm/mach-msm/board-msm8x60.c b/arch/arm/mach-msm/board-msm8x60.c
index 9221f54..056d9d7 100644
--- a/arch/arm/mach-msm/board-msm8x60.c
+++ b/arch/arm/mach-msm/board-msm8x60.c
@@ -30,8 +30,8 @@
 #include <mach/board.h>
 #include <mach/msm_iomap.h>
 
-static void __init msm8x60_fixup(struct machine_desc *desc, struct tag *tag,
-			 char **cmdline, struct meminfo *mi)
+static void __init msm8x60_fixup(struct tag *tag, char **cmdline,
+		struct meminfo *mi)
 {
 	for (; tag->hdr.size; tag = tag_next(tag))
 		if (tag->hdr.tag == ATAG_MEM &&
-- 
Sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.

[PATCHv2] msm: boards: Fix fallout from removal of machine_desc in fixup

[David Brown]

On Tue, Oct 25, 2011 at 09:35:19AM -0700, Stephen Boyd wrote:
> After 0744a3ee (ARM: platform fixups: remove mdesc argument to
> fixup function, 2010-12-20) the fixup functions introduced in
> 9e775ad (ARM: 7012/1: Set proper TEXT_OFFSET for newer MSMs,
> 2011-08-12) cause warnings like:
> 
> arch/arm/mach-msm/board-msm8x60.c:85: warning: initialization
> from incompatible pointer type
> 
> Fix them by removing the machine_desc argument from the fixup
> functions.
> 
> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>

Yes, these got missed among the merges.

Acked-by: David Brown <davidb@codeaurora.org>

Russell, would you prefer this to go through your tracker, or for me
to push this to Arnd?

Thanks,
David

-- 
Sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.

[PATCHv2] msm: boards: Fix fallout from removal of machine_desc in fixup

[Russell King - ARM Linux]

On Tue, Oct 25, 2011 at 01:50:53PM -0700, David Brown wrote:
> On Tue, Oct 25, 2011 at 09:35:19AM -0700, Stephen Boyd wrote:
> > After 0744a3ee (ARM: platform fixups: remove mdesc argument to
> > fixup function, 2010-12-20) the fixup functions introduced in
> > 9e775ad (ARM: 7012/1: Set proper TEXT_OFFSET for newer MSMs,
> > 2011-08-12) cause warnings like:
> > 
> > arch/arm/mach-msm/board-msm8x60.c:85: warning: initialization
> > from incompatible pointer type
> > 
> > Fix them by removing the machine_desc argument from the fixup
> > functions.
> > 
> > Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
> 
> Yes, these got missed among the merges.
> 
> Acked-by: David Brown <davidb@codeaurora.org>
> 
> Russell, would you prefer this to go through your tracker, or for me
> to push this to Arnd?

Either is fine.

[PATCHv2] msm: boards: Fix fallout from removal of machine_desc in fixup

[David Brown]

On Tue, Oct 25, 2011 at 10:06:10PM +0100, Russell King - ARM Linux wrote:
> On Tue, Oct 25, 2011 at 01:50:53PM -0700, David Brown wrote:
> > On Tue, Oct 25, 2011 at 09:35:19AM -0700, Stephen Boyd wrote:
> > > After 0744a3ee (ARM: platform fixups: remove mdesc argument to
> > > fixup function, 2010-12-20) the fixup functions introduced in
> > > 9e775ad (ARM: 7012/1: Set proper TEXT_OFFSET for newer MSMs,
> > > 2011-08-12) cause warnings like:
> > > 
> > > arch/arm/mach-msm/board-msm8x60.c:85: warning: initialization
> > > from incompatible pointer type
> > > 
> > > Fix them by removing the machine_desc argument from the fixup
> > > functions.
> > > 
> > > Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
> > 
> > Yes, these got missed among the merges.
> > 
> > Acked-by: David Brown <davidb@codeaurora.org>
> > 
> > Russell, would you prefer this to go through your tracker, or for me
> > to push this to Arnd?
> 
> Either is fine.

I can pull it, then, since it is entirely inside of MSM.

Thanks,
David

-- 
Sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.