s390/scsi: Convert timers to use timer_setup()

[mirror_ubuntu-bionic-kernel.git] / drivers / s390 / scsi / zfcp_erp.c

diff --git a/drivers/s390/scsi/zfcp_erp.c b/drivers/s390/scsi/zfcp_erp.c
index cbb8156bf5e0c4979896b3f1edd8004c93837cfb..822a852d578e9522d6d2ec10146d0cfe7e7e4272 100644 (file)
--- a/drivers/s390/scsi/zfcp_erp.c
+++ b/drivers/s390/scsi/zfcp_erp.c
@@ -56,6 +56,8 @@ enum zfcp_erp_act_result {
        ZFCP_ERP_NOMEM     = 5,
 };
 
+static void zfcp_erp_memwait_handler(struct timer_list *t);
+
 static void zfcp_erp_adapter_block(struct zfcp_adapter *adapter, int mask)
 {
        zfcp_erp_clear_adapter_status(adapter,
@@ -237,6 +239,7 @@ static struct zfcp_erp_action *zfcp_erp_setup_act(int need, u32 act_status,
        erp_action->fsf_req_id = 0;
        erp_action->action = need;
        erp_action->status = act_status;
+       timer_setup(&erp_action->timer, zfcp_erp_memwait_handler, 0);
 
        return erp_action;
 }
@@ -564,21 +567,22 @@ void zfcp_erp_notify(struct zfcp_erp_action *erp_action, unsigned long set_mask)
  * zfcp_erp_timeout_handler - Trigger ERP action from timed out ERP request
  * @data: ERP action (from timer data)
  */
-void zfcp_erp_timeout_handler(unsigned long data)
+void zfcp_erp_timeout_handler(struct timer_list *t)
 {
-       struct zfcp_erp_action *act = (struct zfcp_erp_action *) data;
+       struct zfcp_fsf_req *fsf_req = from_timer(fsf_req, t, timer);
+       struct zfcp_erp_action *act = fsf_req->erp_action;
        zfcp_erp_notify(act, ZFCP_STATUS_ERP_TIMEDOUT);
 }
 
-static void zfcp_erp_memwait_handler(unsigned long data)
+static void zfcp_erp_memwait_handler(struct timer_list *t)
 {
-       zfcp_erp_notify((struct zfcp_erp_action *)data, 0);
+       struct zfcp_erp_action *act = from_timer(act, t, timer);
+
+       zfcp_erp_notify(act, 0);
 }
 
 static void zfcp_erp_strategy_memwait(struct zfcp_erp_action *erp_action)
 {
-       setup_timer(&erp_action->timer, zfcp_erp_memwait_handler,
-                   (unsigned long) erp_action);
        erp_action->timer.expires = jiffies + HZ;
        add_timer(&erp_action->timer);
 }