[PATCH 04/13] scsi: bnx2i: use setup_timer() helper.

[Allen Pais]

   Use setup_timer function instead of initializing timer with the
   function and data fields.

Signed-off-by: Allen Pais <allen.l...@gmail.com>
---
 drivers/scsi/bnx2i/bnx2i_iscsi.c | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/drivers/scsi/bnx2i/bnx2i_iscsi.c b/drivers/scsi/bnx2i/bnx2i_iscsi.c
index 03c104b..bffc7e9 100644
--- a/drivers/scsi/bnx2i/bnx2i_iscsi.c
+++ b/drivers/scsi/bnx2i/bnx2i_iscsi.c
@@ -1729,10 +1729,8 @@ static int bnx2i_tear_down_conn(struct bnx2i_hba *hba,
        }
 
        ep->state = EP_STATE_CLEANUP_START;
-       init_timer(&ep->ofld_timer);
+       setup_timer(&ep->ofld_timer, bnx2i_ep_ofld_timer, (unsigned long)ep);
        ep->ofld_timer.expires = hba->conn_ctx_destroy_tmo + jiffies;
-       ep->ofld_timer.function = bnx2i_ep_ofld_timer;
-       ep->ofld_timer.data = (unsigned long) ep;
        add_timer(&ep->ofld_timer);
 
        bnx2i_ep_destroy_list_add(hba, ep);
@@ -1835,10 +1833,9 @@ static struct iscsi_endpoint *bnx2i_ep_connect(struct 
Scsi_Host *shost,
        bnx2i_ep->state = EP_STATE_OFLD_START;
        bnx2i_ep_ofld_list_add(hba, bnx2i_ep);
 
-       init_timer(&bnx2i_ep->ofld_timer);
+       setup_timer(&bnx2i_ep->ofld_timer, bnx2i_ep_ofld_timer,
+                   (unsigned long)bnx2i_ep);
        bnx2i_ep->ofld_timer.expires = 2 * HZ + jiffies;
-       bnx2i_ep->ofld_timer.function = bnx2i_ep_ofld_timer;
-       bnx2i_ep->ofld_timer.data = (unsigned long) bnx2i_ep;
        add_timer(&bnx2i_ep->ofld_timer);
 
        if (bnx2i_send_conn_ofld_req(hba, bnx2i_ep)) {
@@ -2054,10 +2051,9 @@ int bnx2i_hw_ep_disconnect(struct bnx2i_endpoint 
*bnx2i_ep)
                session = conn->session;
        }
 
-       init_timer(&bnx2i_ep->ofld_timer);
+       setup_timer(&bnx2i_ep->ofld_timer, bnx2i_ep_ofld_timer,
+                   (unsigned long)bnx2i_ep);
        bnx2i_ep->ofld_timer.expires = hba->conn_teardown_tmo + jiffies;
-       bnx2i_ep->ofld_timer.function = bnx2i_ep_ofld_timer;
-       bnx2i_ep->ofld_timer.data = (unsigned long) bnx2i_ep;
        add_timer(&bnx2i_ep->ofld_timer);
 
        if (!test_bit(BNX2I_CNIC_REGISTERED, &hba->reg_with_cnic))
-- 
2.7.4