2009-04-22 19:05:59

by Coly Li

Subject: [PATCH 5/7] mips cavium-octeon: add parameter to octeon_cvmcount_read()

This patch modifies parameter of octeon_cvmcount_read() from 'void' to 'struct
clocksource *cs', which fixes compile warning for incompatible parameter type.

Signed-off-by: Coly Li <[email protected]>
Cc: David Daney <[email protected]>
Cc: Ingo Molnar <[email protected]>
---
arch/mips/cavium-octeon/csrc-octeon.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/mips/cavium-octeon/csrc-octeon.c
b/arch/mips/cavium-octeon/csrc-octeon.c
index 70fd92c..96110f2 100644
--- a/arch/mips/cavium-octeon/csrc-octeon.c
+++ b/arch/mips/cavium-octeon/csrc-octeon.c
@@ -38,7 +38,7 @@ void octeon_init_cvmcount(void)
local_irq_restore(flags);
}

-static cycle_t octeon_cvmcount_read(void)
+static cycle_t octeon_cvmcount_read(struct clocksource *cs)
{
return read_c0_cvmcount();
}

--
Coly Li
SuSE Labs

2009-04-22 20:35:06

by David Daney

Subject: Re: [PATCH 5/7] mips cavium-octeon: add parameter to octeon_cvmcount_read()

Coly Li wrote:
> This patch modifies parameter of octeon_cvmcount_read() from 'void' to 'struct
> clocksource *cs', which fixes compile warning for incompatible parameter type.
>
> Signed-off-by: Coly Li <[email protected]>
> Cc: David Daney <[email protected]>
> Cc: Ingo Molnar <[email protected]>

It looks good to me:

Reviewed-by: David Daney <[email protected]>


> ---
> arch/mips/cavium-octeon/csrc-octeon.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/arch/mips/cavium-octeon/csrc-octeon.c
> b/arch/mips/cavium-octeon/csrc-octeon.c
> index 70fd92c..96110f2 100644
> --- a/arch/mips/cavium-octeon/csrc-octeon.c
> +++ b/arch/mips/cavium-octeon/csrc-octeon.c
> @@ -38,7 +38,7 @@ void octeon_init_cvmcount(void)
> local_irq_restore(flags);
> }
>
> -static cycle_t octeon_cvmcount_read(void)
> +static cycle_t octeon_cvmcount_read(struct clocksource *cs)
> {
> return read_c0_cvmcount();
> }
>