2009-04-22 19:05:28

by Coly Li

Subject: [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(-)

diff --git a/arch/microblaze/kernel/timer.c b/arch/microblaze/kernel/timer.c
index 05a497e..bdfa2f9 100644
--- a/arch/microblaze/kernel/timer.c
+++ b/arch/microblaze/kernel/timer.c
@@ -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));

--
Coly Li
SuSE Labs

2009-04-23 12:39:41

by Michal Simek

Subject: Re: [PATCH 3/7] microblaze: add parameter to microblaze_read()

Coly Li wrote:
> 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(-)
>
> diff --git a/arch/microblaze/kernel/timer.c b/arch/microblaze/kernel/timer.c
> index 05a497e..bdfa2f9 100644
> --- a/arch/microblaze/kernel/timer.c
> +++ b/arch/microblaze/kernel/timer.c
> @@ -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

--
Michal Simek, Ing. (M.Eng)
PetaLogix - Linux Solutions for a Reconfigurable World
w: http://www.petalogix.com p: +61-7-30090663,+42-0-721842854 f: +61-7-30090663