Use setup_timer function instead of initializing timer with the function and data fields.
Signed-off-by: Allen Pais <allen.l...@gmail.com> --- drivers/block/aoe/aoemain.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/block/aoe/aoemain.c b/drivers/block/aoe/aoemain.c index 4b987c2..20865d4 100644 --- a/drivers/block/aoe/aoemain.c +++ b/drivers/block/aoe/aoemain.c @@ -28,10 +28,8 @@ discover_timer(ulong vp) switch (vp) { case TINIT: - init_timer(&t); + setup_timer(&t, discover_timer, TRUN); spin_lock_init(&lock); - t.data = TRUN; - t.function = discover_timer; die = 0; case TRUN: spin_lock_irqsave(&lock, flags); -- 2.7.4