[ARM PATCH] 2097/2: more gcc-3.4.1 warning fixes

Patch from Nicolas Pitre

At least gcc-3.4.1 complains about puts() declaration conflicting
with its own idea of it.  Our puts() declaration and implementation
isn't standard anyway, so let's rename it to putstr() like on x86.

Signed-off-by: Nicolas Pitre 

arch/arm/boot/compressed/misc.c

@@ -23,17 +23,17 @@ unsigned int __machine_arch_type;
 #include <asm/arch/uncompress.h>
 
 #ifdef STANDALONE_DEBUG
-#define puts printf
+#define putstr printf
 #endif
 
 #ifdef CONFIG_DEBUG_ICEDCC
-#define puts icedcc_puts
+#define putstr icedcc_putstr
 #define putc icedcc_putc
 
 extern void idedcc_putc(int ch);
 
 static void
-icedcc_puts(const char *ptr)
+icedcc_putstr(const char *ptr)
 {
 	for (; *ptr != '\0'; ptr++) {
 		icedcc_putc(*ptr);
@@ -191,7 +191,7 @@ static void error(char *m);
 static void gzip_mark(void **);
 static void gzip_release(void **);
 
-static void puts(const char *);
+static void putstr(const char *);
 
 extern int end;
 static ulg free_mem_ptr;
@@ -280,14 +280,14 @@ void flush_window(void)
 	bytes_out += (ulg)outcnt;
 	output_ptr += (ulg)outcnt;
 	outcnt = 0;
-	puts(".");
+	putstr(".");
 }
 
 static void error(char *x)
 {
-	puts("\n\n");
-	puts(x);
-	puts("\n\n -- System halted");
+	putstr("\n\n");
+	putstr(x);
+	putstr("\n\n -- System halted");
 
 	while(1);	/* Halt */
 }
@@ -306,9 +306,9 @@ decompress_kernel(ulg output_start, ulg free_mem_ptr_p, ulg free_mem_ptr_end_p,
 	arch_decomp_setup();
 
 	makecrc();
-	puts("Uncompressing Linux...");
+	putstr("Uncompressing Linux...");
 	gunzip();
-	puts(" done, booting the kernel.\n");
+	putstr(" done, booting the kernel.\n");
 	return output_ptr;
 }
 #else
@@ -320,9 +320,9 @@ int main()
 	output_data = output_buffer;
 
 	makecrc();
-	puts("Uncompressing Linux...");
+	putstr("Uncompressing Linux...");
 	gunzip();
-	puts("done.\n");
+	putstr("done.\n");
 	return 0;
 }
 #endif

include/asm-arm/arch-cl7500/uncompress.h

@@ -16,7 +16,7 @@ static __inline__ void putc(char c)
 /*
  * This does not append a newline
  */
-static void puts(const char *s)
+static void putstr(const char *s)
 {
 	while (*s) {
 		putc(*s);

include/asm-arm/arch-clps711x/uncompress.h

@@ -40,7 +40,7 @@
 /*
  * This does not append a newline
  */
-static void puts(const char *s)
+static void putstr(const char *s)
 {
 	char c;
 

include/asm-arm/arch-ebsa110/uncompress.h

@@ -11,7 +11,7 @@
 /*
  * This does not append a newline
  */
-static void puts(const char *s)
+static void putstr(const char *s)
 {
 	unsigned long tmp1, tmp2;
 	__asm__ __volatile__(

include/asm-arm/arch-ebsa285/uncompress.h

@@ -29,7 +29,7 @@ static __inline__ void putc(char c)
 /*
  * This does not append a newline
  */
-static void puts(const char *s)
+static void putstr(const char *s)
 {
 	while (*s) {
 		putc(*s);

include/asm-arm/arch-epxa10db/uncompress.h

@@ -26,7 +26,7 @@
 /*
  * This does not append a newline
  */
-static void puts(const char *s)
+static void putstr(const char *s)
 {
 	while (*s) {
 		while ((*UART_TSR(EXC_UART00_BASE) &

include/asm-arm/arch-imx/uncompress.h

@@ -40,7 +40,7 @@
  * This does not append a newline
  */
 static void
-puts(const char *s)
+putstr(const char *s)
 {
 	unsigned long serial_port;
 

include/asm-arm/arch-integrator/uncompress.h

@@ -28,7 +28,7 @@
 /*
  * This does not append a newline
  */
-static void puts(const char *s)
+static void putstr(const char *s)
 {
 	while (*s) {
 		while (AMBA_UART_FR & (1 << 5));

include/asm-arm/arch-iop3xx/uncompress.h

@@ -26,7 +26,7 @@ static __inline__ void putc(char c)
 /*
  * This does not append a newline
  */
-static void puts(const char *s)
+static void putstr(const char *s)
 {
 	while (*s) {
 		putc(*s);

include/asm-arm/arch-ixp2000/uncompress.h

@@ -37,7 +37,7 @@ static __inline__ void putc(char c)
 	*UARTDR = c;
 }
 
-static void puts(const char *s)
+static void putstr(const char *s)
 {
 	while (*s)
 	{

include/asm-arm/arch-ixp4xx/uncompress.h

@@ -32,7 +32,7 @@ static __inline__ void putc(char c)
 /*
  * This does not append a newline
  */
-static void puts(const char *s)
+static void putstr(const char *s)
 {
 	while (*s)
 	{

include/asm-arm/arch-l7200/uncompress.h

@@ -23,7 +23,7 @@ static __inline__ void putc(char c)
 	__raw_writeb(c, IO_UART + 0x00);
 }
 
-static void puts(const char *s)
+static void putstr(const char *s)
 {
 	while (*s) {
 		if (*s == 10) {			/* If a LF, add CR */

include/asm-arm/arch-lh7a40x/uncompress.h

@@ -29,7 +29,7 @@ static __inline__ void putc (char ch)
 	UART_DATA = ch;
 }
 
-static void puts (const char* sz)
+static void putstr (const char* sz)
 {
 	for (; *sz; ++sz) {
 		putc (*sz);

include/asm-arm/arch-omap/uncompress.h

@@ -28,7 +28,7 @@
 #define omap_get_id() ((*(volatile unsigned int *)(0xfffed404)) >> 12) & ID_MASK
 
 static void
-puts(const char *s)
+putstr(const char *s)
 {
 	volatile u8 * uart = 0;
 	int shift = 0;

include/asm-arm/arch-pxa/uncompress.h

@@ -25,7 +25,7 @@ static __inline__ void putc(char c)
 /*
  * This does not append a newline
  */
-static void puts(const char *s)
+static void putstr(const char *s)
 {
 	while (*s) {
 		putc(*s);

include/asm-arm/arch-rpc/uncompress.h

@@ -67,7 +67,7 @@ extern struct param_struct params_phys;
 /*
  * This does not append a newline
  */
-static void puts(const char *s)
+static void putstr(const char *s)
 {
 	extern void ll_write_char(char *, char c, char white);
 	int x,y;

include/asm-arm/arch-s3c2410/uncompress.h

@@ -100,7 +100,7 @@ putc(char ch)
 }
 
 static void
-puts(const char *ptr)
+putstr(const char *ptr)
 {
 	for (; *ptr != '\0'; ptr++) {
 		putc(*ptr);

include/asm-arm/arch-sa1100/uncompress.h

@@ -17,7 +17,7 @@
 
 #define UART(x)		(*(volatile unsigned long *)(serial_port + (x)))
 
-static void puts( const char *s )
+static void putstr( const char *s )
 {
 	unsigned long serial_port;
 

include/asm-arm/arch-shark/uncompress.h

@@ -21,7 +21,7 @@ static __inline__ void putc(char c)
 /*
  * This does not append a newline
  */
-static void puts(const char *s)
+static void putstr(const char *s)
 {
 	while (*s) {
 		putc(*s);

include/asm-arm/arch-versatile/uncompress.h

@@ -25,7 +25,7 @@
 /*
  * This does not append a newline
  */
-static void puts(const char *s)
+static void putstr(const char *s)
 {
 	while (*s) {
 		while (AMBA_UART_FR & (1 << 5))