ARM: delete struct sys_timer
Now that the only field in struct sys_timer is .init, delete the struct, and replace the machine descriptor .timer field with the initialization function itself. This will enable moving timer drivers into drivers/clocksource without having to place a public prototype of each struct sys_timer object into include/linux; the intent is to create a single of_clocksource_init() function that determines which timer driver to initialize by scanning the device dtree, much like the proposed irqchip_init() at: http://www.spinics.net/lists/arm-kernel/msg203686.html Includes mach-omap2 fixes from Igor Grinberg. Tested-by: Robert Jarzmik <robert.jarzmik@free.fr> Signed-off-by: Stephen Warren <swarren@nvidia.com>
This commit is contained in:
@@ -211,7 +211,7 @@ static void rpc_restart(char mode, const char *cmd)
|
||||
soft_restart(0);
|
||||
}
|
||||
|
||||
extern struct sys_timer ioc_timer;
|
||||
void ioc_timer_init(void);
|
||||
|
||||
MACHINE_START(RISCPC, "Acorn-RiscPC")
|
||||
/* Maintainer: Russell King */
|
||||
@@ -220,6 +220,6 @@ MACHINE_START(RISCPC, "Acorn-RiscPC")
|
||||
.reserve_lp1 = 1,
|
||||
.map_io = rpc_map_io,
|
||||
.init_irq = rpc_init_irq,
|
||||
.timer = &ioc_timer,
|
||||
.init_time = ioc_timer_init,
|
||||
.restart = rpc_restart,
|
||||
MACHINE_END
|
||||
|
@@ -82,14 +82,9 @@ static struct irqaction ioc_timer_irq = {
|
||||
/*
|
||||
* Set up timer interrupt.
|
||||
*/
|
||||
static void __init ioc_timer_init(void)
|
||||
void __init ioc_timer_init(void)
|
||||
{
|
||||
arch_gettimeoffset = ioc_timer_gettimeoffset;
|
||||
ioctime_init();
|
||||
setup_irq(IRQ_TIMER0, &ioc_timer_irq);
|
||||
}
|
||||
|
||||
struct sys_timer ioc_timer = {
|
||||
.init = ioc_timer_init,
|
||||
};
|
||||
|
||||
|
Reference in New Issue
Block a user