Re: git pull request for minimal omap3 support one more time

[Tony Lindgren <tony@atomide.com>]

[-- Attachment #1: Type: text/plain, Size: 2043 bytes --]

* Tony Lindgren <tony@atomide.com> [081014 13:37]:
> * Russell King - ARM Linux <linux@arm.linux.org.uk> [081014 12:39]:
> > On Tue, Oct 14, 2008 at 10:19:08AM -0700, Tony Lindgren wrote:
> > > * Russell King - ARM Linux <linux@arm.linux.org.uk> [081013 09:15]:
> > > > There's something wrong with one of the sets I've pulled from you:
> > > > 
> > > > arch/arm/mach-omap2/mcbsp.c:253: error: ???INT_24XX_MCBSP3_IRQ_RX??? undeclared here (not in a function)
> > > > arch/arm/mach-omap2/mcbsp.c:254: error: ???INT_24XX_MCBSP3_IRQ_TX??? undeclared here (not in a function)
> > > > arch/arm/mach-omap2/mcbsp.c:262: error: ???INT_24XX_MCBSP4_IRQ_RX??? undeclared here (not in a function)
> > > > arch/arm/mach-omap2/mcbsp.c:263: error: ???INT_24XX_MCBSP4_IRQ_TX??? undeclared here (not in a function)
> > > > arch/arm/mach-omap2/mcbsp.c:271: error: ???INT_24XX_MCBSP5_IRQ_RX??? undeclared here (not in a function)
> > > > arch/arm/mach-omap2/mcbsp.c:272: error: ???INT_24XX_MCBSP5_IRQ_TX??? undeclared here (not in a function)
> > > > 
> > > > Please take a look and resolve ASAP.  Thanks.
> > > 
> > > Sorry for the delay, I was sitting in an airplane again.
> > > 
> > > Here's the fix, looks like the missing McBSP irqs should have been
> > > merged into the recent McBSP patches.
> > > 
> > > This patch is also in your patch system as 5301/1.
> > 
> > Thanks, that solved that problem, but there's one more to come:
> > 
> > arch/arm/plat-omap/devices.c: In function 'omap_mcbsp_register_board_cfg':
> > arch/arm/plat-omap/devices.c:163: error: 'OMAP_MAX_MCBSP_COUNT' undeclared (first use in this function)
> > arch/arm/plat-omap/devices.c:163: error: (Each undeclared identifier is reported only once
> > arch/arm/plat-omap/devices.c:163: error: for each function it appears in.)
> > 
> > The good news is that that seems to be the last error building for LDP.
> 
> Grrr, just few mins and I'll send a patch. Will also build test this
> time :)

Here's the patch to fix this. Also available in your patch system as 5305/1.

Regards,

Tony

[-- Attachment #2: mcbsp.patch --]
[-- Type: text/x-diff, Size: 979 bytes --]

From: Tony Lindgren <tony@atomide.com>
Date: Tue, 14 Oct 2008 13:43:48 -0700
Subject: [PATCH] ARM: OMAP: Fix compile of McBSP by removing unnecessary check

Recent McBSP patches changed to allocating devices dynamically
and the check for OMAP_MAX_MCBSP_COUNT became unnecessary.

The check for OMAP_MAX_MCBSP_COUNT should have been removed with
the earlier McBSP patches in devices.c but was accidentally left
out.

Signed-off-by: Tony Lindgren <tony@atomide.com>

--- a/arch/arm/plat-omap/devices.c
+++ b/arch/arm/plat-omap/devices.c
@@ -159,13 +159,6 @@ void omap_mcbsp_register_board_cfg(struct omap_mcbsp_platform_data *config,
 {
 	int i;
 
-	if (size > OMAP_MAX_MCBSP_COUNT) {
-		printk(KERN_WARNING "Registered too many McBSPs platform_data."
-			" Using maximum (%d) available.\n",
-			OMAP_MAX_MCBSP_COUNT);
-		size = OMAP_MAX_MCBSP_COUNT;
-	}
-
 	omap_mcbsp_devices = kzalloc(size * sizeof(struct platform_device *),
 				     GFP_KERNEL);
 	if (!omap_mcbsp_devices) {