[PATCH] ARM: OMAP2: fix mailbox init code

Fix this:

arch/arm/mach-omap2/mailbox.c: In function 'omap2_mbox_probe':
arch/arm/mach-omap2/mailbox.c:354: error: 'omap2_mboxes' undeclared (first use in this function)
arch/arm/mach-omap2/mailbox.c:354: error: (Each undeclared identifier is reported only once
arch/arm/mach-omap2/mailbox.c:354: error: for each function it appears in.)

Which happens on CONFIG_ARCH_OMAP2 && !CONFIG_SOC_OMAP2420, due to
missing omap2_mboxes declaration.

In addition, make sure we declare the right mailbox instances for 2430.

Reported-by: Russell King <redacted>
Signed-off-by: Ohad Ben-Cohen <redacted>
Cc: Tony Lindgren <tony@atomide.com>
Cc: Hiroshi Doyu <redacted>
Cc: Omar Ramirez Luna <redacted>
---
 arch/arm/mach-omap2/mailbox.c |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mach-omap2/mailbox.c b/arch/arm/mach-omap2/mailbox.c
index 609ea2d..415a6f1 100644
--- a/arch/arm/mach-omap2/mailbox.c
+++ b/arch/arm/mach-omap2/mailbox.c

@@ -281,8 +281,16 @@ static struct omap_mbox mbox_iva_info = {
 	.ops	= &omap2_mbox_ops,
 	.priv	= &omap2_mbox_iva_priv,
 };
+#endif
 
-struct omap_mbox *omap2_mboxes[] = { &mbox_dsp_info, &mbox_iva_info, NULL };
+#ifdef CONFIG_ARCH_OMAP2
+struct omap_mbox *omap2_mboxes[] = {
+	&mbox_dsp_info,
+#ifdef CONFIG_SOC_OMAP2420
+	&mbox_iva_info,
+#endif
+	NULL
+};
 #endif
 
 #if defined(CONFIG_ARCH_OMAP4)

-- 
1.7.5.4

On Thu, Feb 23, 2012 at 14:23:35, Ohad Ben-Cohen wrote:
[...]

Which happens on CONFIG_ARCH_OMAP2 && !CONFIG_SOC_OMAP2420, due to
missing omap2_mboxes declaration.

[...]

 
-struct omap_mbox *omap2_mboxes[] = { &mbox_dsp_info, &mbox_iva_info, NULL };
+#ifdef CONFIG_ARCH_OMAP2
+struct omap_mbox *omap2_mboxes[] = {
+	&mbox_dsp_info,
+#ifdef CONFIG_SOC_OMAP2420
+	&mbox_iva_info,
+#endif
+	NULL
+};
 #endif
 
 #if defined(CONFIG_ARCH_OMAP4)

Instead of adding more #ifs can they be completely removed please?

Hi,

On Thu, Feb 23, 2012 at 3:18 AM, Bedia, Vaibhav [off-list ref] wrote:

On Thu, Feb 23, 2012 at 14:23:35, Ohad Ben-Cohen wrote:
[...]

quoted

Which happens on CONFIG_ARCH_OMAP2 && !CONFIG_SOC_OMAP2420, due to
missing omap2_mboxes declaration.

[...]

quoted

-struct omap_mbox *omap2_mboxes[] = { &mbox_dsp_info, &mbox_iva_info, NULL };
+#ifdef CONFIG_ARCH_OMAP2
+struct omap_mbox *omap2_mboxes[] = {
+ ? ? &mbox_dsp_info,
+#ifdef CONFIG_SOC_OMAP2420
+ ? ? &mbox_iva_info,
+#endif
+ ? ? NULL
+};
?#endif

?#if defined(CONFIG_ARCH_OMAP4)

Instead of adding more #ifs can they be completely removed please?

I'll rebase/repost this series:

[PATCH 0/7] OMAP: mailbox: removing static declarations
http://comments.gmane.org/gmane.linux.ports.arm.omap/59620

In the meantime I would appreciate comments.

Regards,

Omar

On Thu, Feb 23, 2012 at 11:18 AM, Bedia, Vaibhav [off-list ref] wrote:

Instead of adding more #ifs can they be completely removed please?

Care to propose something specific (which is viable for the -rc cycle) ?

Thanks,
Ohad.

* Ohad Ben-Cohen [off-list ref] [120223 08:32]:

On Thu, Feb 23, 2012 at 11:18 AM, Bedia, Vaibhav [off-list ref] wrote:

quoted

Instead of adding more #ifs can they be completely removed please?

Care to propose something specific (which is viable for the -rc cycle) ?

This is pretty much the minimal change for -rc cycle so I'll apply
this into fixes.

Regards,

Tony