|
@@ -572,9 +572,8 @@ static void zfcp_erp_memwait_handler(unsigned long data)
|
|
|
|
|
|
static void zfcp_erp_strategy_memwait(struct zfcp_erp_action *erp_action)
|
|
static void zfcp_erp_strategy_memwait(struct zfcp_erp_action *erp_action)
|
|
{
|
|
{
|
|
- init_timer(&erp_action->timer);
|
|
|
|
- erp_action->timer.function = zfcp_erp_memwait_handler;
|
|
|
|
- erp_action->timer.data = (unsigned long) erp_action;
|
|
|
|
|
|
+ setup_timer(&erp_action->timer, zfcp_erp_memwait_handler,
|
|
|
|
+ (unsigned long) erp_action);
|
|
erp_action->timer.expires = jiffies + HZ;
|
|
erp_action->timer.expires = jiffies + HZ;
|
|
add_timer(&erp_action->timer);
|
|
add_timer(&erp_action->timer);
|
|
}
|
|
}
|