Skip to contentSkip to conversation

mips cavium-octeon: add parameter to octeon_cvmcount_read()

PATCH Applied Coly Li 3 participants 4 messages Apr 22, 2009 – May 5, 2009 MIPS

lore
Share & tools
lore

Coly Li

author
#0 lore raw

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(-)
(quoted diff) +0 -0

b/arch/mips/cavium-octeon/csrc-octeon.c
index 70fd92c..96110f2 100644

arch/mips/cavium-octeon/csrc-octeon.c +1 -1
@@ -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();
 }
Signature · 2 lines
Coly Li
SuSE Labs
Reviewed-by on v1 5/7
#1 lore raw
Quoted 6 lines · Coly Li

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]>
Quoted 19 lines
---
 arch/mips/cavium-octeon/csrc-octeon.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/mips/cavium-octeon/csrc-octeon.c +1 -1
index 70fd92c..96110f2 100644
@@ -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();
 }
Applied
#2 lore raw
Quoted 11 lines · David Daney
Quoted 6 lines · Coly Li

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]>

Applied, thanks.

Coly, if you modify MIPS code, please cc the linux-mips mailing list and myself or generally consult the MAINTAINERS file for who to cc on patches.

Thanks!

Ralf

author
#3 lore raw

Ralf Baechle Wrote:

Quoted 9 lines · David Daney
Quoted 8 lines
Quoted 6 lines · Coly Li

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]>
Quoted 9 lines
Quoted 3 lines

It looks good to me:

Reviewed-by David Daney <[email protected]>

Applied, thanks.

Coly, if you modify MIPS code, please cc the linux-mips mailing list and myself or generally consult the MAINTAINERS file for who to cc on patches.

Ralf, I keep you advice in mind. Thanks.

Signature · 2 lines
Coly Li
SuSE Labs