hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Sudip Mukherjee 2016-07-14 12:07:43 -07:00 committed by Linus Torvalds
parent d3d36c4b5c
commit 9babed6a66
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
arch/m32r/boot/compressed/m32r_sio.c
View File

@ -8,12 +8,13 @@
#include <asm/processor.h> #include <asm/processor.h>
static void putc(char c); static void m32r_putc(char c);
static int puts(const char *s) static int puts(const char *s)
{ {
char c; char c;
while ((c = *s++)) putc(c); while ((c = *s++))
m32r_putc(c);
return 0; return 0;
} }
@ -41,7 +42,7 @@ static int puts(const char *s)
#define BOOT_SIO0TXB PLD_ESIO0TXB #define BOOT_SIO0TXB PLD_ESIO0TXB
#endif #endif
static void putc(char c) static void m32r_putc(char c)
{ {
while ((*BOOT_SIO0STS & 0x3) != 0x3) while ((*BOOT_SIO0STS & 0x3) != 0x3)
cpu_relax(); cpu_relax();
@ -61,7 +62,7 @@ static void putc(char c)
#define SIO0TXB (volatile unsigned short *)(0x00efd000 + 30) #define SIO0TXB (volatile unsigned short *)(0x00efd000 + 30)
#endif #endif
static void putc(char c) static void m32r_putc(char c)
{ {
while ((*SIO0STS & 0x1) == 0) while ((*SIO0STS & 0x1) == 0)
cpu_relax(); cpu_relax();