From: Robert Love <robert.w.love@intel.com>
Date: Fri, 27 Feb 2009 18:56:00 +0000 (-0800)
Subject: [SCSI] fcoe: Use setup_timer() and mod_timer()
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=a468f328ad83f14556e5961ef1de80b32b428d32;p=linux-2.6-omap-h63xx.git

[SCSI] fcoe: Use setup_timer() and mod_timer()

Use helper functions for watchdog timer setup.

Signed-off-by: Robert Love <robert.w.love@intel.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
---

diff --git a/drivers/scsi/fcoe/libfcoe.c b/drivers/scsi/fcoe/libfcoe.c
index 02f044a8715..7887f2a7c2a 100644
--- a/drivers/scsi/fcoe/libfcoe.c
+++ b/drivers/scsi/fcoe/libfcoe.c
@@ -1435,11 +1435,9 @@ static int __init fcoe_init(void)
 	 */
 	fcoe_dev_setup();
 
-	init_timer(&fcoe_timer);
-	fcoe_timer.data = 0;
-	fcoe_timer.function = fcoe_watchdog;
-	fcoe_timer.expires = (jiffies + (10 * HZ));
-	add_timer(&fcoe_timer);
+	setup_timer(&fcoe_timer, fcoe_watchdog, 0);
+
+	mod_timer(&fcoe_timer, jiffies + (10 * HZ));
 
 	/* initiatlize the fcoe transport */
 	fcoe_transport_init();