2003-05-03 13:33:15

by Vinay K Nallamothu

Subject: [PATCH 2.{4,5}.x] mod_timer conversions for mptctl.c

Hi,

Trivial {del,add}_timer to mod_timer conversions.

vinay

--- linux-2.5.68/drivers/message/fusion/mptctl.c 2003-03-25 10:07:57.000000000 +0530
+++ linux-2.5.68-nvk/drivers/message/fusion/mptctl.c 2003-05-03 15:50:42.000000000 +0530
@@ -269,11 +269,8 @@
*/
iocStatus = reply->u.reply.IOCStatus & MPI_IOCSTATUS_MASK;
if (iocStatus == MPI_IOCSTATUS_SCSI_TASK_MGMT_FAILED) {
- if (ioc->ioctl->status & MPT_IOCTL_STATUS_TIMER_ACTIVE) {
- del_timer (&ioc->ioctl->timer);
- ioc->ioctl->timer.expires = jiffies + HZ;
- add_timer(&ioc->ioctl->timer);
- }
+ if (ioc->ioctl->status & MPT_IOCTL_STATUS_TIMER_ACTIVE)
+ mod_timer(&ioc->ioctl->timer, jiffies + HZ);
}
ioc->ioctl->tmPtr = NULL;