public inbox for linuxppc-dev@ozlabs.org 
 help / color / mirror / Atom feed
From: Matt Porter <mporter@kernel•crashing.org>
To: akpm@osdl•org
Cc: scott_anderson@mvista•com, linuxppc-embedded@ozlabs•org
Subject: [PATCH][PPC32] Fix ppc4xx_progress warnings
Date: Thu, 28 Oct 2004 16:34:59 -0700	[thread overview]
Message-ID: <20041028163459.A5934@home.com> (raw)

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

             reply	other threads:[~2004-10-28 23:35 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2004-10-28 23:34 Matt Porter [this message]
2004-10-29  2:11 ` [PATCH][PPC32] Fix ppc4xx_progress warnings Andrew Morton

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20041028163459.A5934@home.com \
    --to=mporter@kernel$(echo .)crashing.org \
    --cc=akpm@osdl$(echo .)org \
    --cc=linuxppc-embedded@ozlabs$(echo .)org \
    --cc=scott_anderson@mvista$(echo .)com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox