* [PATCH][PPC32] Fix ppc4xx_progress warnings
@ 2004-10-28 23:34 Matt Porter
2004-10-29 2:11 ` Andrew Morton
0 siblings, 1 reply; 2+ messages in thread
From: Matt Porter @ 2004-10-28 23:34 UTC (permalink / raw)
To: akpm; +Cc: scott_anderson, linuxppc-embedded
The patch fixes these warnings by doing two things:
1) Add the argument to the printk.
2) Rearrange the ifdef to eliminate the unused variable
and function warnings.
Signed-off-by: Scott Anderson <sanders@mvista.com>
Signed-off-by: Matt Porter <mporter@kernel.crashing.org>
--- arch/ppc/syslib/ppc4xx_setup.c.~1~ 2004-10-18 14:53:06.000000000 -0700
+++ arch/ppc/syslib/ppc4xx_setup.c 2004-10-28 15:24:59.000000000 -0700
@@ -191,6 +191,7 @@ ppc4xx_calibrate_decr(void)
}
#ifdef CONFIG_SERIAL_TEXT_DEBUG
+#ifdef SERIAL_DEBUG_IO_BASE
/* We assume that the UART has already been initialized by the
firmware or the boot loader */
static void
@@ -204,7 +205,6 @@ static void
ppc4xx_progress(char *s, unsigned short hex)
{
char c;
-#ifdef SERIAL_DEBUG_IO_BASE
u8 *com_port = (u8 *) SERIAL_DEBUG_IO_BASE;
while ((c = *s++) != '\0') {
@@ -212,10 +212,14 @@ ppc4xx_progress(char *s, unsigned short
}
serial_putc(com_port, '\r');
serial_putc(com_port, '\n');
+}
#else
- printk("%s\r\n");
-#endif
+static void
+ppc4xx_progress(char *s, unsigned short hex)
+{
+ printk("%s\r\n", s);
}
+#endif
#endif /* CONFIG_SERIAL_TEXT_DEBUG */
/*
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH][PPC32] Fix ppc4xx_progress warnings
2004-10-28 23:34 [PATCH][PPC32] Fix ppc4xx_progress warnings Matt Porter
@ 2004-10-29 2:11 ` Andrew Morton
0 siblings, 0 replies; 2+ messages in thread
From: Andrew Morton @ 2004-10-29 2:11 UTC (permalink / raw)
To: Matt Porter; +Cc: scott_anderson, linuxppc-embedded
Matt Porter <mporter@kernel.crashing.org> wrote:
>
> --- arch/ppc/syslib/ppc4xx_setup.c.~1~ 2004-10-18 14:53:06.000000000 -0700
> +++ arch/ppc/syslib/ppc4xx_setup.c 2004-10-28 15:24:59.000000000 -0700
Please ensure that future patches are in `patch -p1' form, thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2004-10-29 2:28 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2004-10-28 23:34 [PATCH][PPC32] Fix ppc4xx_progress warnings Matt Porter
2004-10-29 2:11 ` Andrew Morton
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).