Message ID | 1506073905-12985-12-git-send-email-allen.lkml@gmail.com (mailing list archive) |
---|---|
State | Not Applicable |
Headers | show |
diff --git a/drivers/scsi/dc395x.c b/drivers/scsi/dc395x.c index 5ee7f44..f9aaa8b 100644 --- a/drivers/scsi/dc395x.c +++ b/drivers/scsi/dc395x.c @@ -857,9 +857,7 @@ static void waiting_set_timer(struct AdapterCtlBlk *acb, unsigned long to) { if (timer_pending(&acb->waiting_timer)) return; - init_timer(&acb->waiting_timer); - acb->waiting_timer.function = waiting_timeout; - acb->waiting_timer.data = (unsigned long) acb; + setup_timer(&acb->waiting_timer, waiting_timeout, (unsigned long)acb); if (time_before(jiffies + to, acb->last_reset - HZ / 2)) acb->waiting_timer.expires = acb->last_reset - HZ / 2 + 1;
Use setup_timer function instead of initializing timer with the function and data fields. Signed-off-by: Allen Pais <allen.lkml@gmail.com> --- drivers/scsi/dc395x.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)