aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSudip Mukherjee <sudipm.mukherjee@gmail.com>2016-07-14 15:07:43 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2016-07-15 01:54:27 -0400
commit9babed6a66b5577628d9e76e5a6cb6104d7ddd4c (patch)
tree56f99457f24e7a779947215bd8b11f80c0623e53
parentd3d36c4b5c5fbdd68542be73ffd53eb210fbf7cf (diff)
m32r: fix build warning about putc
We were getting build warning: arch/m32r/boot/compressed/m32r_sio.c:11:13: warning: conflicting types for built-in function 'putc' Here putc is used as a static function so lets just rename it to avoid the conflict with the builtin putc. Link: http://lkml.kernel.org/r/1466977046-24724-1-git-send-email-sudipm.mukherjee@gmail.com Signed-off-by: Sudip Mukherjee <sudip.mukherjee@codethink.co.uk> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--arch/m32r/boot/compressed/m32r_sio.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/m32r/boot/compressed/m32r_sio.c b/arch/m32r/boot/compressed/m32r_sio.c
index 01d877c6868f..cf3023dced49 100644
--- a/arch/m32r/boot/compressed/m32r_sio.c
+++ b/arch/m32r/boot/compressed/m32r_sio.c
@@ -8,12 +8,13 @@
8 8
9#include <asm/processor.h> 9#include <asm/processor.h>
10 10
11static void putc(char c); 11static void m32r_putc(char c);
12 12
13static int puts(const char *s) 13static int puts(const char *s)
14{ 14{
15 char c; 15 char c;
16 while ((c = *s++)) putc(c); 16 while ((c = *s++))
17 m32r_putc(c);
17 return 0; 18 return 0;
18} 19}
19 20
@@ -41,7 +42,7 @@ static int puts(const char *s)
41#define BOOT_SIO0TXB PLD_ESIO0TXB 42#define BOOT_SIO0TXB PLD_ESIO0TXB
42#endif 43#endif
43 44
44static void putc(char c) 45static void m32r_putc(char c)
45{ 46{
46 while ((*BOOT_SIO0STS & 0x3) != 0x3) 47 while ((*BOOT_SIO0STS & 0x3) != 0x3)
47 cpu_relax(); 48 cpu_relax();
@@ -61,7 +62,7 @@ static void putc(char c)
61#define SIO0TXB (volatile unsigned short *)(0x00efd000 + 30) 62#define SIO0TXB (volatile unsigned short *)(0x00efd000 + 30)
62#endif 63#endif
63 64
64static void putc(char c) 65static void m32r_putc(char c)
65{ 66{
66 while ((*SIO0STS & 0x1) == 0) 67 while ((*SIO0STS & 0x1) == 0)
67 cpu_relax(); 68 cpu_relax();