Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8e19608e authored by Magnus Damm's avatar Magnus Damm Committed by Linus Torvalds
Browse files

clocksource: pass clocksource to read() callback 



Pass clocksource pointer to the read() callback for clocksources.  This
allows us to share the callback between multiple instances.

[hugh@veritas.com: fix powerpc build of clocksource pass clocksource mods]
[akpm@linux-foundation.org: cleanup]
Signed-off-by: default avatarMagnus Damm <damm@igel.co.jp>
Acked-by: default avatarJohn Stultz <johnstul@us.ibm.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarHugh Dickins <hugh@veritas.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ff14ed5d

arch/arm/mach-at91/at91rm9200_time.c

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ static struct irqaction at91rm9200_timer_irq = { 
	.handler	= at91rm9200_timer_interrupt

};



static cycle_t read_clk32k(void)

static cycle_t read_clk32k(struct clocksource *cs)

{

	return read_CRTR();

}

arch/arm/mach-at91/at91sam926x_time.c

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ static u32 pit_cnt; /* access only w/system irq blocked */ 
 * Clocksource:  just a monotonic counter of MCK/16 cycles.

 * We don't care whether or not PIT irqs are enabled.

 */

static cycle_t read_pit_clk(void)

static cycle_t read_pit_clk(struct clocksource *cs)

{

	unsigned long flags;

	u32 elapsed;

arch/arm/mach-davinci/time.c

+1 −1
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ static void __init timer_init(void) 
/*

 * clocksource

 */

static cycle_t read_cycles(void)

static cycle_t read_cycles(struct clocksource *cs)

{

	struct timer_s *t = &timers[TID_CLOCKSOURCE];

arch/arm/mach-imx/time.c

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ static void __init imx_timer_hardware_init(void) 
	IMX_TCTL(TIMER_BASE) = TCTL_FRR | TCTL_CLK_PCLK1 | TCTL_TEN;

}



cycle_t imx_get_cycles(void)

cycle_t imx_get_cycles(struct clocksource *cs)

{

	return IMX_TCN(TIMER_BASE);

}

arch/arm/mach-ixp4xx/common.c

+1 −1
Original line number Diff line number Diff line
@@ -401,7 +401,7 @@ void __init ixp4xx_sys_init(void) 
/*

 * clocksource

 */

cycle_t ixp4xx_get_cycles(void)

cycle_t ixp4xx_get_cycles(struct clocksource *cs)

{

	return *IXP4XX_OSTS;

}