-----Original Message----- From: Colin King [mailto:colin.king@xxxxxxxxxxxxx] Sent: 24 November 2017 19:14 To: Gurumurthy, Anil <Anil.Gurumurthy@xxxxxxxxxx>; Kalluru, Sudarsana <Sudarsana.Kalluru@xxxxxxxxxx>; James E . J . Bottomley <jejb@xxxxxxxxxxxxxxxxxx>; Martin K . Petersen <martin.petersen@xxxxxxxxxx>; linux-scsi@xxxxxxxxxxxxxxx Cc: kernel-janitors@xxxxxxxxxxxxxxx; linux-kernel@xxxxxxxxxxxxxxx Subject: [PATCH] scsi: bfa: use setup_timer instead of init_timer From: Colin Ian King <colin.king@xxxxxxxxxxxxx> Use setup_timer function instead of initializing timer with the function and data fields. Signed-off-by: Colin Ian King <colin.king@xxxxxxxxxxxxx> --- drivers/scsi/bfa/bfad.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/scsi/bfa/bfad.c b/drivers/scsi/bfa/bfad.c index 5caf5f3ff642..c910b238bc9e 100644 --- a/drivers/scsi/bfa/bfad.c +++ b/drivers/scsi/bfa/bfad.c @@ -719,10 +719,7 @@ bfad_bfa_tmo(unsigned long data) void bfad_init_timer(struct bfad_s *bfad) { - init_timer(&bfad->hal_tmo); - bfad->hal_tmo.function = bfad_bfa_tmo; - bfad->hal_tmo.data = (unsigned long)bfad; - + setup_timer(&bfad->hal_tmo, bfad_bfa_tmo, (unsigned long)bfad); mod_timer(&bfad->hal_tmo, jiffies + msecs_to_jiffies(BFA_TIMER_FREQ)); } -- 2.14.1 Acked-by: Anil Gurumurthy <anil.gurumurthy@xxxxxxxxxx>