Fix ppc4xx_progress warnings

PATCH In review Matt Porter 2 participants 2 messages Oct 28, 2004 – Oct 29, 2004

Share & tools

Matt Porter

author

2004-10-28 23:35 UTC #0 lore raw

PATCH 1/1 Fix ppc4xx_progress warnings

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 <[email protected]>

Signed-off-by Matt Porter <[email protected]>

ppc/syslib/ppc4xx_setup.c renamed from ppc/syslib/ppc4xx_setup.c.~1~ +7 -3

@@ -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 */
 
 /*

Andrew Morton

2004-10-29 02:28 UTC #1 lore raw

Quoted 3 lines · Matt Porter

--- 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.