From 33c1621245b506188007780e849b346ce1971921 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Thu, 1 Nov 2018 04:13:05 +0000 Subject: [PATCH] iscsi-scst: Convert init_timer() into setup_timer() calls git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.3.x@7546 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- iscsi-scst/kernel/isert-scst/isert_login.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/iscsi-scst/kernel/isert-scst/isert_login.c b/iscsi-scst/kernel/isert-scst/isert_login.c index d1ed53f07..115c297bd 100644 --- a/iscsi-scst/kernel/isert-scst/isert_login.c +++ b/iscsi-scst/kernel/isert-scst/isert_login.c @@ -171,10 +171,9 @@ static int add_new_connection(struct isert_listener_dev *dev, INIT_WORK(&conn->close_work, isert_close_conn_fn); #endif - init_timer(&conn_dev->tmo_timer); - conn_dev->tmo_timer.function = isert_conn_timer_fn; + setup_timer(&conn_dev->tmo_timer, isert_conn_timer_fn, + (unsigned long)conn_dev); conn_dev->tmo_timer.expires = jiffies + 60 * HZ; - conn_dev->tmo_timer.data = (unsigned long)conn_dev; add_timer(&conn_dev->tmo_timer); conn_dev->timer_active = 1; wake_up(&dev->waitqueue);