public inbox for linux-omap@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/2] Revert "omap: Fix compile for early_param and omap_smc1"
@ 2010-03-04  7:40 felipe.balbi
  2010-03-04  7:40 ` [PATCH 2/2] arm: omap: ehci: avoid compiler error with touchbook felipe.balbi
  2010-03-04  7:50 ` [PATCH 1/2] Revert "omap: Fix compile for early_param and omap_smc1" Felipe Balbi
  0 siblings, 2 replies; 18+ messages in thread
From: felipe.balbi @ 2010-03-04  7:40 UTC (permalink / raw)
  To: Linux OMAP Mailing List; +Cc: Tony Lindgren, Felipe Balbi

From: Felipe Balbi <felipe.balbi@nokia.com>

This reverts commit a91741262f0ae82d651c7270bc1354016c5bb9dd.

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 arch/arm/mach-omap2/board-4430sdp.c        |    2 +-
 arch/arm/mach-omap2/board-omap3touchbook.c |   12 ++++++------
 drivers/video/omap2/vram.c                 |   14 +++++---------
 3 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach-omap2/board-4430sdp.c
index a462d50..180ac11 100644
--- a/arch/arm/mach-omap2/board-4430sdp.c
+++ b/arch/arm/mach-omap2/board-4430sdp.c
@@ -49,7 +49,7 @@ static struct omap_board_config_kernel sdp4430_config[] __initdata = {
 	{ OMAP_TAG_LCD,		&sdp4430_lcd_config },
 };
 
-#if defined(CONFIG_SMP) && defined(CONFIG_CACHE_L2X0)
+#ifdef CONFIG_CACHE_L2X0
 noinline void omap_smc1(u32 fn, u32 arg)
 {
 	register u32 r12 asm("r12") = fn;
diff --git a/arch/arm/mach-omap2/board-omap3touchbook.c b/arch/arm/mach-omap2/board-omap3touchbook.c
index 07b7a32..3943d0f 100644
--- a/arch/arm/mach-omap2/board-omap3touchbook.c
+++ b/arch/arm/mach-omap2/board-omap3touchbook.c
@@ -493,7 +493,7 @@ static void __init omap3touchbook_flash_init(void)
 	}
 }
 
-static struct ehci_hcd_omap_platform_data ehci_pdata __initdata = {
+static struct ehci_hcd_omap_platform_data ehci_pdata __initconst = {
 
 	.port_mode[0] = EHCI_HCD_OMAP_MODE_PHY,
 	.port_mode[1] = EHCI_HCD_OMAP_MODE_PHY,
@@ -518,14 +518,14 @@ static void omap3_touchbook_poweroff(void)
 	gpio_direction_output(TB_KILL_POWER_GPIO, 0);
 }
 
-static int __init early_touchbook_revision(char *p)
+static void __init early_touchbook_revision(char **p)
 {
-	if (!p)
-		return 0;
+	if (!*p)
+		return;
 
-	return strict_strtoul(p, 10, &touchbook_revision);
+	strict_strtoul(*p, 10, &touchbook_revision);
 }
-early_param("tbr", early_touchbook_revision);
+__early_param("tbr=", early_touchbook_revision);
 
 static struct omap_musb_board_data musb_board_data = {
 	.interface_type		= MUSB_INTERFACE_ULPI,
diff --git a/drivers/video/omap2/vram.c b/drivers/video/omap2/vram.c
index 1d88425..55a4de5 100644
--- a/drivers/video/omap2/vram.c
+++ b/drivers/video/omap2/vram.c
@@ -511,17 +511,13 @@ static u32 omap_vram_sdram_size __initdata;
 static u32 omap_vram_def_sdram_size __initdata;
 static u32 omap_vram_def_sdram_start __initdata;
 
-static int __init omap_vram_early_vram(char *p)
+static void __init omap_vram_early_vram(char **p)
 {
-	char *endp;
-
-	omap_vram_def_sdram_size = memparse(p, &endp);
-	if (*endp == ',')
-		omap_vram_def_sdram_start = simple_strtoul(endp + 1, &p, 16);
-
-	return 0;
+	omap_vram_def_sdram_size = memparse(*p, p);
+	if (**p == ',')
+		omap_vram_def_sdram_start = simple_strtoul((*p) + 1, p, 16);
 }
-early_param("vram", omap_vram_early_vram);
+__early_param("vram=", omap_vram_early_vram);
 
 /*
  * Called from map_io. We need to call to this early enough so that we
-- 
1.7.0.rc0.33.g7c3932


^ permalink raw reply related	[flat|nested] 18+ messages in thread
end of thread, other threads:[~2010-03-11 16:36 UTC | newest]

Thread overview: 18+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-03-04  7:40 [PATCH 1/2] Revert "omap: Fix compile for early_param and omap_smc1" felipe.balbi
2010-03-04  7:40 ` [PATCH 2/2] arm: omap: ehci: avoid compiler error with touchbook felipe.balbi
2010-03-04  7:44   ` Felipe Balbi
2010-03-04  7:45     ` felipe.balbi
2010-03-04 13:03       ` Gadiyar, Anand
2010-03-04 19:15         ` me
2010-03-05  7:03           ` Felipe Balbi
2010-03-08 23:04             ` Tony Lindgren
2010-03-09 14:30               ` Felipe Balbi
2010-03-09 15:38                 ` Tony Lindgren
2010-03-09 15:47                   ` Felipe Balbi
2010-03-10  0:48                     ` Tony Lindgren
2010-03-10  6:22                       ` Felipe Balbi
2010-03-10 17:15                         ` Tony Lindgren
2010-03-11  7:28                           ` Felipe Balbi
2010-03-11 16:38                             ` Tony Lindgren
2010-03-04  7:50 ` [PATCH 1/2] Revert "omap: Fix compile for early_param and omap_smc1" Felipe Balbi
2010-03-04  7:57   ` [PATCH 1/2] Manual revert of " felipe.balbi

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox