* [PATCH 1/2] arm: msm: trout: fix build failure without UART @ 2010-04-23 18:11 Daniel Walker 2010-04-23 18:11 ` [PATCH 2/2] arm: msm: smd: fix initcall prototype compiler warning Daniel Walker 2010-04-24 4:59 ` [PATCH 1/2] arm: msm: trout: fix build failure without UART Pavel Machek 0 siblings, 2 replies; 4+ messages in thread From: Daniel Walker @ 2010-04-23 18:11 UTC (permalink / raw) To: linux-arm-msm; +Cc: Daniel Walker Without a debug uart selected you get this failure, arch/arm/mach-msm/board-trout.c:85: error: 'MSM_DEBUG_UART_PHYS' undeclared here (not in a function) arch/arm/mach-msm/board-trout.c:86: error: 'MSM_DEBUG_UART_BASE' undeclared here (not in a function) This just removes these lines in that case. Signed-off-by: Daniel Walker <dwalker@codeaurora.org> --- arch/arm/mach-msm/board-trout.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-msm/board-trout.c b/arch/arm/mach-msm/board-trout.c index 9793ff4..b88aec2 100644 --- a/arch/arm/mach-msm/board-trout.c +++ b/arch/arm/mach-msm/board-trout.c @@ -82,8 +82,10 @@ static void __init trout_map_io(void) } MACHINE_START(TROUT, "HTC Dream") +#ifdef CONFIG_MSM_DEBUG_UART .phys_io = MSM_DEBUG_UART_PHYS, .io_pg_offst = ((MSM_DEBUG_UART_BASE) >> 18) & 0xfffc, +#endif .boot_params = 0x10000100, .fixup = trout_fixup, .map_io = trout_map_io, -- 1.6.2.3 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] arm: msm: smd: fix initcall prototype compiler warning 2010-04-23 18:11 [PATCH 1/2] arm: msm: trout: fix build failure without UART Daniel Walker @ 2010-04-23 18:11 ` Daniel Walker 2010-04-24 5:01 ` Pavel Machek 2010-04-24 4:59 ` [PATCH 1/2] arm: msm: trout: fix build failure without UART Pavel Machek 1 sibling, 1 reply; 4+ messages in thread From: Daniel Walker @ 2010-04-23 18:11 UTC (permalink / raw) To: linux-arm-msm; +Cc: Daniel Walker This fixes the following warning, arch/arm/mach-msm/smd_debug.c:240: warning: initialization from incompatible pointer type Signed-off-by: Daniel Walker <dwalker@codeaurora.org> --- arch/arm/mach-msm/smd_debug.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-msm/smd_debug.c b/arch/arm/mach-msm/smd_debug.c index 0cc3ef8..3b2dd71 100644 --- a/arch/arm/mach-msm/smd_debug.c +++ b/arch/arm/mach-msm/smd_debug.c @@ -221,13 +221,13 @@ static void debug_create(const char *name, mode_t mode, debugfs_create_file(name, mode, dent, fill, &debug_ops); } -static void smd_debugfs_init(void) +static int smd_debugfs_init(void) { struct dentry *dent; dent = debugfs_create_dir("smd", 0); if (IS_ERR(dent)) - return; + return 1; debug_create("ch", 0444, dent, debug_read_ch); debug_create("stat", 0444, dent, debug_read_stat); @@ -235,6 +235,8 @@ static void smd_debugfs_init(void) debug_create("version", 0444, dent, debug_read_version); debug_create("tbl", 0444, dent, debug_read_alloc_tbl); debug_create("build", 0444, dent, debug_read_build_id); + + return 0; } late_initcall(smd_debugfs_init); -- 1.6.2.3 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 2/2] arm: msm: smd: fix initcall prototype compiler warning 2010-04-23 18:11 ` [PATCH 2/2] arm: msm: smd: fix initcall prototype compiler warning Daniel Walker @ 2010-04-24 5:01 ` Pavel Machek 0 siblings, 0 replies; 4+ messages in thread From: Pavel Machek @ 2010-04-24 5:01 UTC (permalink / raw) To: Daniel Walker; +Cc: linux-arm-msm On Fri 2010-04-23 11:11:26, Daniel Walker wrote: > This fixes the following warning, > > arch/arm/mach-msm/smd_debug.c:240: warning: initialization from incompatible pointer type > > Signed-off-by: Daniel Walker <dwalker@codeaurora.org> ACK. > --- > arch/arm/mach-msm/smd_debug.c | 6 ++++-- > 1 files changed, 4 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/mach-msm/smd_debug.c b/arch/arm/mach-msm/smd_debug.c > index 0cc3ef8..3b2dd71 100644 > --- a/arch/arm/mach-msm/smd_debug.c > +++ b/arch/arm/mach-msm/smd_debug.c > @@ -221,13 +221,13 @@ static void debug_create(const char *name, mode_t mode, > debugfs_create_file(name, mode, dent, fill, &debug_ops); > } > > -static void smd_debugfs_init(void) > +static int smd_debugfs_init(void) > { > struct dentry *dent; > > dent = debugfs_create_dir("smd", 0); > if (IS_ERR(dent)) > - return; > + return 1; > > debug_create("ch", 0444, dent, debug_read_ch); > debug_create("stat", 0444, dent, debug_read_stat); > @@ -235,6 +235,8 @@ static void smd_debugfs_init(void) > debug_create("version", 0444, dent, debug_read_version); > debug_create("tbl", 0444, dent, debug_read_alloc_tbl); > debug_create("build", 0444, dent, debug_read_build_id); > + > + return 0; > } > > late_initcall(smd_debugfs_init); -- (english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] arm: msm: trout: fix build failure without UART 2010-04-23 18:11 [PATCH 1/2] arm: msm: trout: fix build failure without UART Daniel Walker 2010-04-23 18:11 ` [PATCH 2/2] arm: msm: smd: fix initcall prototype compiler warning Daniel Walker @ 2010-04-24 4:59 ` Pavel Machek 1 sibling, 0 replies; 4+ messages in thread From: Pavel Machek @ 2010-04-24 4:59 UTC (permalink / raw) To: Daniel Walker; +Cc: linux-arm-msm On Fri 2010-04-23 11:11:25, Daniel Walker wrote: > Without a debug uart selected you get this failure, > > arch/arm/mach-msm/board-trout.c:85: error: 'MSM_DEBUG_UART_PHYS' undeclared here (not in a function) > arch/arm/mach-msm/board-trout.c:86: error: 'MSM_DEBUG_UART_BASE' undeclared here (not in a function) > > This just removes these lines in that case. > > Signed-off-by: Daniel Walker <dwalker@codeaurora.org> ACK. > --- > arch/arm/mach-msm/board-trout.c | 2 ++ > 1 files changed, 2 insertions(+), 0 deletions(-) > > diff --git a/arch/arm/mach-msm/board-trout.c b/arch/arm/mach-msm/board-trout.c > index 9793ff4..b88aec2 100644 > --- a/arch/arm/mach-msm/board-trout.c > +++ b/arch/arm/mach-msm/board-trout.c > @@ -82,8 +82,10 @@ static void __init trout_map_io(void) > } > > MACHINE_START(TROUT, "HTC Dream") > +#ifdef CONFIG_MSM_DEBUG_UART > .phys_io = MSM_DEBUG_UART_PHYS, > .io_pg_offst = ((MSM_DEBUG_UART_BASE) >> 18) & 0xfffc, > +#endif > .boot_params = 0x10000100, > .fixup = trout_fixup, > .map_io = trout_map_io, -- (english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-04-24 5:01 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2010-04-23 18:11 [PATCH 1/2] arm: msm: trout: fix build failure without UART Daniel Walker 2010-04-23 18:11 ` [PATCH 2/2] arm: msm: smd: fix initcall prototype compiler warning Daniel Walker 2010-04-24 5:01 ` Pavel Machek 2010-04-24 4:59 ` [PATCH 1/2] arm: msm: trout: fix build failure without UART Pavel Machek
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).