* [PATCH v2] m32r: fix build warning about putc
@ 2016-06-26 21:37 Sudip Mukherjee
2016-07-03 20:03 ` Sudip Mukherjee
0 siblings, 1 reply; 2+ messages in thread
From: Sudip Mukherjee @ 2016-06-26 21:37 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-kernel, Sudip Mukherjee
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.
Signed-off-by: Sudip Mukherjee <sudip.mukherjee@codethink.co.uk>
---
v1: was having checkpatch warning. My mistake. I removed the braces in
the while loop.
build log is at:
https://travis-ci.org/sudipm-mukherjee/parport/jobs/139958498
arch/m32r/boot/compressed/m32r_sio.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/arch/m32r/boot/compressed/m32r_sio.c b/arch/m32r/boot/compressed/m32r_sio.c
index 01d877c..e5c0c60 100644
--- a/arch/m32r/boot/compressed/m32r_sio.c
+++ b/arch/m32r/boot/compressed/m32r_sio.c
@@ -8,12 +8,13 @@
#include <asm/processor.h>
-static void putc(char c);
+static void m32r_putc(char c);
static int puts(const char *s)
{
char c;
- while ((c = *s++)) putc(c);
+ while ((c = *s++))
+ m32r_putc(c);
return 0;
}
@@ -41,7 +42,7 @@ static int puts(const char *s)
#define BOOT_SIO0TXB PLD_ESIO0TXB
#endif
-static void putc(char c)
+static void m32r_putc(char c)
{
while ((*BOOT_SIO0STS & 0x3) != 0x3)
cpu_relax();
@@ -61,7 +62,7 @@ static void putc(char c)
#define SIO0TXB (volatile unsigned short *)(0x00efd000 + 30)
#endif
-static void putc(char c)
+static void m32r_putc(char c)
{
while ((*SIO0STS & 0x1) == 0)
cpu_relax();
--
1.9.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v2] m32r: fix build warning about putc
2016-06-26 21:37 [PATCH v2] m32r: fix build warning about putc Sudip Mukherjee
@ 2016-07-03 20:03 ` Sudip Mukherjee
0 siblings, 0 replies; 2+ messages in thread
From: Sudip Mukherjee @ 2016-07-03 20:03 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-kernel
On Sunday 26 June 2016 10:37 PM, Sudip Mukherjee wrote:
> 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.
>
> Signed-off-by: Sudip Mukherjee <sudip.mukherjee@codethink.co.uk>
> ---
>
> v1: was having checkpatch warning. My mistake. I removed the braces in
> the while loop.
Hi Andrew,
A gentle ping.
I know its too early for ping but you usually pick up all valid patches
in a day or two.
Infact, in this patch there is an assignment in the loop condition which
is not good, so if you want I can send a v3 by changing the loop to a
do-while loop and thus removing the assignment in the condition.
Regards
Sudip
>
> build log is at:
> https://travis-ci.org/sudipm-mukherjee/parport/jobs/139958498
>
> arch/m32r/boot/compressed/m32r_sio.c | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/arch/m32r/boot/compressed/m32r_sio.c b/arch/m32r/boot/compressed/m32r_sio.c
> index 01d877c..e5c0c60 100644
> --- a/arch/m32r/boot/compressed/m32r_sio.c
> +++ b/arch/m32r/boot/compressed/m32r_sio.c
> @@ -8,12 +8,13 @@
>
> #include <asm/processor.h>
>
> -static void putc(char c);
> +static void m32r_putc(char c);
>
> static int puts(const char *s)
> {
> char c;
> - while ((c = *s++)) putc(c);
> + while ((c = *s++))
> + m32r_putc(c);
> return 0;
> }
>
> @@ -41,7 +42,7 @@ static int puts(const char *s)
> #define BOOT_SIO0TXB PLD_ESIO0TXB
> #endif
>
> -static void putc(char c)
> +static void m32r_putc(char c)
> {
> while ((*BOOT_SIO0STS & 0x3) != 0x3)
> cpu_relax();
> @@ -61,7 +62,7 @@ static void putc(char c)
> #define SIO0TXB (volatile unsigned short *)(0x00efd000 + 30)
> #endif
>
> -static void putc(char c)
> +static void m32r_putc(char c)
> {
> while ((*SIO0STS & 0x1) == 0)
> cpu_relax();
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-07-03 20:04 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-06-26 21:37 [PATCH v2] m32r: fix build warning about putc Sudip Mukherjee
2016-07-03 20:03 ` Sudip Mukherjee
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).