aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/pmcraid.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/scsi/pmcraid.c')
-rw-r--r--drivers/scsi/pmcraid.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c
index 4f9f115fb6a0..e58be98430b0 100644
--- a/drivers/scsi/pmcraid.c
+++ b/drivers/scsi/pmcraid.c
@@ -604,7 +604,7 @@ static void pmcraid_start_bist(struct pmcraid_cmd *cmd)
604 604
605 cmd->time_left = msecs_to_jiffies(PMCRAID_BIST_TIMEOUT); 605 cmd->time_left = msecs_to_jiffies(PMCRAID_BIST_TIMEOUT);
606 cmd->timer.expires = jiffies + msecs_to_jiffies(PMCRAID_BIST_TIMEOUT); 606 cmd->timer.expires = jiffies + msecs_to_jiffies(PMCRAID_BIST_TIMEOUT);
607 cmd->timer.function = (TIMER_FUNC_TYPE)pmcraid_bist_done; 607 cmd->timer.function = pmcraid_bist_done;
608 add_timer(&cmd->timer); 608 add_timer(&cmd->timer);
609} 609}
610 610
@@ -636,7 +636,7 @@ static void pmcraid_reset_alert_done(struct timer_list *t)
636 /* restart timer if some more time is available to wait */ 636 /* restart timer if some more time is available to wait */
637 cmd->time_left -= PMCRAID_CHECK_FOR_RESET_TIMEOUT; 637 cmd->time_left -= PMCRAID_CHECK_FOR_RESET_TIMEOUT;
638 cmd->timer.expires = jiffies + PMCRAID_CHECK_FOR_RESET_TIMEOUT; 638 cmd->timer.expires = jiffies + PMCRAID_CHECK_FOR_RESET_TIMEOUT;
639 cmd->timer.function = (TIMER_FUNC_TYPE)pmcraid_reset_alert_done; 639 cmd->timer.function = pmcraid_reset_alert_done;
640 add_timer(&cmd->timer); 640 add_timer(&cmd->timer);
641 } 641 }
642} 642}
@@ -673,7 +673,7 @@ static void pmcraid_reset_alert(struct pmcraid_cmd *cmd)
673 */ 673 */
674 cmd->time_left = PMCRAID_RESET_TIMEOUT; 674 cmd->time_left = PMCRAID_RESET_TIMEOUT;
675 cmd->timer.expires = jiffies + PMCRAID_CHECK_FOR_RESET_TIMEOUT; 675 cmd->timer.expires = jiffies + PMCRAID_CHECK_FOR_RESET_TIMEOUT;
676 cmd->timer.function = (TIMER_FUNC_TYPE)pmcraid_reset_alert_done; 676 cmd->timer.function = pmcraid_reset_alert_done;
677 add_timer(&cmd->timer); 677 add_timer(&cmd->timer);
678 678
679 iowrite32(DOORBELL_IOA_RESET_ALERT, 679 iowrite32(DOORBELL_IOA_RESET_ALERT,
@@ -923,7 +923,7 @@ static void pmcraid_send_cmd(
923 if (timeout_func) { 923 if (timeout_func) {
924 /* setup timeout handler */ 924 /* setup timeout handler */
925 cmd->timer.expires = jiffies + timeout; 925 cmd->timer.expires = jiffies + timeout;
926 cmd->timer.function = (TIMER_FUNC_TYPE)timeout_func; 926 cmd->timer.function = timeout_func;
927 add_timer(&cmd->timer); 927 add_timer(&cmd->timer);
928 } 928 }
929 929
@@ -1951,7 +1951,7 @@ static void pmcraid_soft_reset(struct pmcraid_cmd *cmd)
1951 cmd->cmd_done = pmcraid_ioa_reset; 1951 cmd->cmd_done = pmcraid_ioa_reset;
1952 cmd->timer.expires = jiffies + 1952 cmd->timer.expires = jiffies +
1953 msecs_to_jiffies(PMCRAID_TRANSOP_TIMEOUT); 1953 msecs_to_jiffies(PMCRAID_TRANSOP_TIMEOUT);
1954 cmd->timer.function = (TIMER_FUNC_TYPE)pmcraid_timeout_handler; 1954 cmd->timer.function = pmcraid_timeout_handler;
1955 1955
1956 if (!timer_pending(&cmd->timer)) 1956 if (!timer_pending(&cmd->timer))
1957 add_timer(&cmd->timer); 1957 add_timer(&cmd->timer);