linux-mips.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] octeon: prom_putchar() must be void
@ 2017-01-17 17:36 Alexander Sverdlin
  2017-01-17 17:36 ` Alexander Sverdlin
                   ` (2 more replies)
  0 siblings, 3 replies; 7+ messages in thread
From: Alexander Sverdlin @ 2017-01-17 17:36 UTC (permalink / raw)
  Cc: Alexander Sverdlin, Alexander Sverdlin, Ralf Baechle,
	David Daney, Aaro Koskinen, Steven J. Hill, linux-mips

From: Alexander Sverdlin <alexander.sverdlin@nsn.com>

Correct the function return type.

Signed-off-by: Alexander Sverdlin <alexander.sverdlin@nokia.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: David Daney <david.daney@cavium.com>
Cc: Aaro Koskinen <aaro.koskinen@nokia.com>
Cc: "Steven J. Hill" <steven.hill@cavium.com>
Cc: linux-mips@linux-mips.org
---
 arch/mips/cavium-octeon/setup.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/arch/mips/cavium-octeon/setup.c b/arch/mips/cavium-octeon/setup.c
index 9a2db1c013d9..bb613d3e5246 100644
--- a/arch/mips/cavium-octeon/setup.c
+++ b/arch/mips/cavium-octeon/setup.c
@@ -1095,7 +1095,7 @@ void __init plat_mem_setup(void)
  * Emit one character to the boot UART.	 Exported for use by the
  * watchdog timer.
  */
-int prom_putchar(char c)
+void prom_putchar(char c)
 {
 	uint64_t lsrval;
 
@@ -1106,7 +1106,6 @@ int prom_putchar(char c)
 
 	/* Write the byte */
 	cvmx_write_csr(CVMX_MIO_UARTX_THR(octeon_uart), c & 0xffull);
-	return 1;
 }
 EXPORT_SYMBOL(prom_putchar);
 
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [PATCH] octeon: prom_putchar() must be void
  2017-01-17 17:36 [PATCH] octeon: prom_putchar() must be void Alexander Sverdlin
@ 2017-01-17 17:36 ` Alexander Sverdlin
  2017-01-17 17:58 ` David Daney
  2017-01-17 18:00 ` Ralf Baechle
  2 siblings, 0 replies; 7+ messages in thread
From: Alexander Sverdlin @ 2017-01-17 17:36 UTC (permalink / raw)
  Cc: Alexander Sverdlin, Alexander Sverdlin, Ralf Baechle,
	David Daney, Aaro Koskinen, Steven J. Hill, linux-mips

From: Alexander Sverdlin <alexander.sverdlin@nsn.com>

Correct the function return type.

Signed-off-by: Alexander Sverdlin <alexander.sverdlin@nokia.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: David Daney <david.daney@cavium.com>
Cc: Aaro Koskinen <aaro.koskinen@nokia.com>
Cc: "Steven J. Hill" <steven.hill@cavium.com>
Cc: linux-mips@linux-mips.org
---
 arch/mips/cavium-octeon/setup.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/arch/mips/cavium-octeon/setup.c b/arch/mips/cavium-octeon/setup.c
index 9a2db1c013d9..bb613d3e5246 100644
--- a/arch/mips/cavium-octeon/setup.c
+++ b/arch/mips/cavium-octeon/setup.c
@@ -1095,7 +1095,7 @@ void __init plat_mem_setup(void)
  * Emit one character to the boot UART.	 Exported for use by the
  * watchdog timer.
  */
-int prom_putchar(char c)
+void prom_putchar(char c)
 {
 	uint64_t lsrval;
 
@@ -1106,7 +1106,6 @@ int prom_putchar(char c)
 
 	/* Write the byte */
 	cvmx_write_csr(CVMX_MIO_UARTX_THR(octeon_uart), c & 0xffull);
-	return 1;
 }
 EXPORT_SYMBOL(prom_putchar);
 
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 7+ messages in thread

* Re: [PATCH] octeon: prom_putchar() must be void
  2017-01-17 17:36 [PATCH] octeon: prom_putchar() must be void Alexander Sverdlin
  2017-01-17 17:36 ` Alexander Sverdlin
@ 2017-01-17 17:58 ` David Daney
  2017-01-17 17:58   ` David Daney
  2017-01-17 18:00 ` Ralf Baechle
  2 siblings, 1 reply; 7+ messages in thread
From: David Daney @ 2017-01-17 17:58 UTC (permalink / raw)
  To: Alexander Sverdlin
  Cc: Ralf Baechle, David Daney, Aaro Koskinen, Steven J. Hill, linux-mips

On 01/17/2017 09:36 AM, Alexander Sverdlin wrote:
> From: Alexander Sverdlin <alexander.sverdlin@nsn.com>
>
> Correct the function return type.
>
> Signed-off-by: Alexander Sverdlin <alexander.sverdlin@nokia.com>

This will make it conflict with the declaration in
drivers/watchdog/octeon-wdt-main.c

*Iff* you also fix the watchdog site, you can add Acked-by: David Daney 
<david.daney@cavium.com>


> Cc: Ralf Baechle <ralf@linux-mips.org>
> Cc: David Daney <david.daney@cavium.com>
> Cc: Aaro Koskinen <aaro.koskinen@nokia.com>
> Cc: "Steven J. Hill" <steven.hill@cavium.com>
> Cc: linux-mips@linux-mips.org
> ---
>  arch/mips/cavium-octeon/setup.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/arch/mips/cavium-octeon/setup.c b/arch/mips/cavium-octeon/setup.c
> index 9a2db1c013d9..bb613d3e5246 100644
> --- a/arch/mips/cavium-octeon/setup.c
> +++ b/arch/mips/cavium-octeon/setup.c
> @@ -1095,7 +1095,7 @@ void __init plat_mem_setup(void)
>   * Emit one character to the boot UART.	 Exported for use by the
>   * watchdog timer.
>   */
> -int prom_putchar(char c)
> +void prom_putchar(char c)
>  {
>  	uint64_t lsrval;
>
> @@ -1106,7 +1106,6 @@ int prom_putchar(char c)
>
>  	/* Write the byte */
>  	cvmx_write_csr(CVMX_MIO_UARTX_THR(octeon_uart), c & 0xffull);
> -	return 1;
>  }
>  EXPORT_SYMBOL(prom_putchar);
>
>

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH] octeon: prom_putchar() must be void
  2017-01-17 17:58 ` David Daney
@ 2017-01-17 17:58   ` David Daney
  0 siblings, 0 replies; 7+ messages in thread
From: David Daney @ 2017-01-17 17:58 UTC (permalink / raw)
  To: Alexander Sverdlin
  Cc: Ralf Baechle, David Daney, Aaro Koskinen, Steven J. Hill, linux-mips

On 01/17/2017 09:36 AM, Alexander Sverdlin wrote:
> From: Alexander Sverdlin <alexander.sverdlin@nsn.com>
>
> Correct the function return type.
>
> Signed-off-by: Alexander Sverdlin <alexander.sverdlin@nokia.com>

This will make it conflict with the declaration in
drivers/watchdog/octeon-wdt-main.c

*Iff* you also fix the watchdog site, you can add Acked-by: David Daney 
<david.daney@cavium.com>


> Cc: Ralf Baechle <ralf@linux-mips.org>
> Cc: David Daney <david.daney@cavium.com>
> Cc: Aaro Koskinen <aaro.koskinen@nokia.com>
> Cc: "Steven J. Hill" <steven.hill@cavium.com>
> Cc: linux-mips@linux-mips.org
> ---
>  arch/mips/cavium-octeon/setup.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/arch/mips/cavium-octeon/setup.c b/arch/mips/cavium-octeon/setup.c
> index 9a2db1c013d9..bb613d3e5246 100644
> --- a/arch/mips/cavium-octeon/setup.c
> +++ b/arch/mips/cavium-octeon/setup.c
> @@ -1095,7 +1095,7 @@ void __init plat_mem_setup(void)
>   * Emit one character to the boot UART.	 Exported for use by the
>   * watchdog timer.
>   */
> -int prom_putchar(char c)
> +void prom_putchar(char c)
>  {
>  	uint64_t lsrval;
>
> @@ -1106,7 +1106,6 @@ int prom_putchar(char c)
>
>  	/* Write the byte */
>  	cvmx_write_csr(CVMX_MIO_UARTX_THR(octeon_uart), c & 0xffull);
> -	return 1;
>  }
>  EXPORT_SYMBOL(prom_putchar);
>
>

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH] octeon: prom_putchar() must be void
  2017-01-17 17:36 [PATCH] octeon: prom_putchar() must be void Alexander Sverdlin
  2017-01-17 17:36 ` Alexander Sverdlin
  2017-01-17 17:58 ` David Daney
@ 2017-01-17 18:00 ` Ralf Baechle
  2017-01-17 18:02   ` David Daney
  2 siblings, 1 reply; 7+ messages in thread
From: Ralf Baechle @ 2017-01-17 18:00 UTC (permalink / raw)
  To: Alexander Sverdlin
  Cc: Alexander Sverdlin, David Daney, Aaro Koskinen, Florian Fainelli,
	Steven J. Hill, linux-mips

On Tue, Jan 17, 2017 at 06:36:44PM +0100, Alexander Sverdlin wrote:
> Date:   Tue, 17 Jan 2017 18:36:44 +0100
> From: Alexander Sverdlin <alexander.sverdlin@nokia.com>
> To: unlisted-recipients: no To-header on input <;
> CC: Alexander Sverdlin <alexander.sverdlin@nsn.com>, Alexander Sverdlin
>  <alexander.sverdlin@nokia.com>, Ralf Baechle <ralf@linux-mips.org>, David
>  Daney <david.daney@cavium.com>, Aaro Koskinen <aaro.koskinen@nokia.com>,
>  "Steven J. Hill" <steven.hill@cavium.com>, linux-mips@linux-mips.org
> Subject: [PATCH] octeon: prom_putchar() must be void
> Content-Type: text/plain
> 
> From: Alexander Sverdlin <alexander.sverdlin@nsn.com>
> 
> Correct the function return type.

Thanks Alexander.  There is another instance of the same issue in
arch/mips/ar7/prom.c which I'm going to take care of.

  Ralf

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH] octeon: prom_putchar() must be void
  2017-01-17 18:00 ` Ralf Baechle
@ 2017-01-17 18:02   ` David Daney
  2017-01-17 18:02     ` David Daney
  0 siblings, 1 reply; 7+ messages in thread
From: David Daney @ 2017-01-17 18:02 UTC (permalink / raw)
  To: Ralf Baechle, Alexander Sverdlin
  Cc: Alexander Sverdlin, David Daney, Aaro Koskinen, Florian Fainelli,
	Steven J. Hill, linux-mips

On 01/17/2017 10:00 AM, Ralf Baechle wrote:
> On Tue, Jan 17, 2017 at 06:36:44PM +0100, Alexander Sverdlin wrote:
>> Date:   Tue, 17 Jan 2017 18:36:44 +0100
>> From: Alexander Sverdlin <alexander.sverdlin@nokia.com>
>> To: unlisted-recipients: no To-header on input <;
>> CC: Alexander Sverdlin <alexander.sverdlin@nsn.com>, Alexander Sverdlin
>>  <alexander.sverdlin@nokia.com>, Ralf Baechle <ralf@linux-mips.org>, David
>>  Daney <david.daney@cavium.com>, Aaro Koskinen <aaro.koskinen@nokia.com>,
>>  "Steven J. Hill" <steven.hill@cavium.com>, linux-mips@linux-mips.org
>> Subject: [PATCH] octeon: prom_putchar() must be void
>> Content-Type: text/plain
>>
>> From: Alexander Sverdlin <alexander.sverdlin@nsn.com>
>>
>> Correct the function return type.
>
> Thanks Alexander.  There is another instance of the same issue in
> arch/mips/ar7/prom.c which I'm going to take care of.
>

If it were declared in a common .h file, this wouldn't have ever 
happened.  Perhaps you should add such a declaration.

>   Ralf
>

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH] octeon: prom_putchar() must be void
  2017-01-17 18:02   ` David Daney
@ 2017-01-17 18:02     ` David Daney
  0 siblings, 0 replies; 7+ messages in thread
From: David Daney @ 2017-01-17 18:02 UTC (permalink / raw)
  To: Ralf Baechle, Alexander Sverdlin
  Cc: Alexander Sverdlin, David Daney, Aaro Koskinen, Florian Fainelli,
	Steven J. Hill, linux-mips

On 01/17/2017 10:00 AM, Ralf Baechle wrote:
> On Tue, Jan 17, 2017 at 06:36:44PM +0100, Alexander Sverdlin wrote:
>> Date:   Tue, 17 Jan 2017 18:36:44 +0100
>> From: Alexander Sverdlin <alexander.sverdlin@nokia.com>
>> To: unlisted-recipients: no To-header on input <;
>> CC: Alexander Sverdlin <alexander.sverdlin@nsn.com>, Alexander Sverdlin
>>  <alexander.sverdlin@nokia.com>, Ralf Baechle <ralf@linux-mips.org>, David
>>  Daney <david.daney@cavium.com>, Aaro Koskinen <aaro.koskinen@nokia.com>,
>>  "Steven J. Hill" <steven.hill@cavium.com>, linux-mips@linux-mips.org
>> Subject: [PATCH] octeon: prom_putchar() must be void
>> Content-Type: text/plain
>>
>> From: Alexander Sverdlin <alexander.sverdlin@nsn.com>
>>
>> Correct the function return type.
>
> Thanks Alexander.  There is another instance of the same issue in
> arch/mips/ar7/prom.c which I'm going to take care of.
>

If it were declared in a common .h file, this wouldn't have ever 
happened.  Perhaps you should add such a declaration.

>   Ralf
>

^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2017-01-17 18:02 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-01-17 17:36 [PATCH] octeon: prom_putchar() must be void Alexander Sverdlin
2017-01-17 17:36 ` Alexander Sverdlin
2017-01-17 17:58 ` David Daney
2017-01-17 17:58   ` David Daney
2017-01-17 18:00 ` Ralf Baechle
2017-01-17 18:02   ` David Daney
2017-01-17 18:02     ` David Daney

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).