microblaze: add parameter to microblaze_read()
PATCH 3/7 microblaze: add parameter to microblaze_read()
This patch modifies parameter of microblaze_read() from 'void' to 'struct clocksource *cs', which fixes compile warning for incompatible parameter type.
Signed-off-by Coly Li <[email protected]>
Cc Michal Simek <[email protected]>
Cc Ingo Molnar <[email protected]>
--- arch/microblaze/kernel/timer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
arch/microblaze/kernel/timer.c +1 -1
@@ -176,7 +176,7 @@ static __init void microblaze_clockevent_init(void)clockevents_register_device (&clockevent_microblaze_timer); } -static cycle_t microblaze_read (void ) +static cycle_t microblaze_read (struct clocksource *cs) {/* reading actual value of timer 1 */ return (cycle_t) (in_be32 (TIMER_BASE +TCR1 ));
Signature · 2 lines
Coly Li SuSE Labs
Quoted 17 lines · Coly Li
This patch modifies parameter of
microblaze_read()from 'void' to 'struct clocksource *cs', which fixes compile warning for incompatible parameter type.Signed-off-by Coly Li <[email protected]>Cc Michal Simek <[email protected]>Cc Ingo Molnar <[email protected]>--- arch/microblaze/kernel/timer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)arch/microblaze/kernel/timer.c +0
-0
arch/microblaze/kernel/timer.c static __init void microblaze_clockevent_init(void) · line 182
Quoted 8 lines
arch/microblaze/kernel/timer.c +1
-1@@ -176,7 +176,7 @@ static __init void microblaze_clockevent_init(void)clockevents_register_device (&clockevent_microblaze_timer); } -static cycle_t microblaze_read (void ) +static cycle_t microblaze_read (struct clocksource *cs) {/* reading actual value of timer 1 */ return (cycle_t) (in_be32 (TIMER_BASE +TCR1 ));
Add to fixes-for-linus branch.
Michal
Signature · 3 lines
Michal Simek, Ing. (M.Eng) PetaLogix - Linux Solutions for a Reconfigurable World w: www.petalogix.com p: +61-7-30090663,+42-0-721842854 f: +61-7-30090663