Skip to contentSkip to conversation

ARM: OMAP2: fix mailbox init code

PATCH New Ohad Ben-Cohen 4 participants 5 messages Feb 23, 2012

Subsystems (3)
Arm (32-bit) Arm sub-architectures OMAP2+ support
lore
Share & tools
lore

Ohad Ben-Cohen

author
#0 lore raw

PATCH 1/1 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 <[email protected]>
Signed-off-by Ohad Ben-Cohen <[email protected]>
Cc Tony Lindgren <[email protected]>
Cc Hiroshi Doyu <[email protected]>
Cc Omar Ramirez Luna <[email protected]>
---
 arch/arm/mach-omap2/mailbox.c |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)
arch/arm/mach-omap2/mailbox.c +9 -1
index 609ea2d..415a6f1 100644
@@ -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)
Signature · 1 line
1.7.5.4
#1 lore raw

PATCH 1/1 ARM: OMAP2: fix mailbox init code

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

Quoted 4 lines

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

[...]

arch/arm/mach-omap2/mailbox.c static struct omap_mbox mbox_iva_info = { · line 296

Quoted 13 lines
arch/arm/mach-omap2/mailbox.c +8 -1
-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?

#2 lore raw

PATCH 1/1 ARM: OMAP2: fix mailbox init code

Hi,

Quoted 19 lines · Vaibhav

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

Quoted 4 lines

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

[...]

Quoted 12 lines
arch/arm/mach-omap2/mailbox.c +8 -1
-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

Quoted 3 lines
Quoted 1 line

?#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

author
#3 lore raw

PATCH 1/1 ARM: OMAP2: fix mailbox init code

In reply to Bedia, Vaibhav
Quoted 1 line · Vaibhav

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.

maintainer
#4 lore raw

PATCH 1/1 ARM: OMAP2: fix mailbox init code

Quoted 4 lines · Ohad Ben-Cohen
Quoted 1 line · Vaibhav

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