Use setup_timer function instead of initializing timer with the function and data fields. Signed-off-by: Allen Pais <allen.lkml@xxxxxxxxx> --- drivers/scsi/esas2r/esas2r_main.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/scsi/esas2r/esas2r_main.c b/drivers/scsi/esas2r/esas2r_main.c index 81f226b..590db6d 100644 --- a/drivers/scsi/esas2r/esas2r_main.c +++ b/drivers/scsi/esas2r/esas2r_main.c @@ -1635,10 +1635,8 @@ static void esas2r_timer_callback(unsigned long context); void esas2r_kickoff_timer(struct esas2r_adapter *a) { - init_timer(&a->timer); - a->timer.function = esas2r_timer_callback; - a->timer.data = (unsigned long)a; + setup_timer(&a->timer, esas2r_timer_callback, (unsigned long)a); a->timer.expires = jiffies + msecs_to_jiffies(100); -- 2.7.4