|
@@ -2860,11 +2860,12 @@ out:
|
|
|
|
|
|
#define PQI_HEARTBEAT_TIMER_INTERVAL (10 * HZ)
|
|
#define PQI_HEARTBEAT_TIMER_INTERVAL (10 * HZ)
|
|
|
|
|
|
-static void pqi_heartbeat_timer_handler(unsigned long data)
|
|
|
|
|
|
+static void pqi_heartbeat_timer_handler(struct timer_list *t)
|
|
{
|
|
{
|
|
int num_interrupts;
|
|
int num_interrupts;
|
|
u32 heartbeat_count;
|
|
u32 heartbeat_count;
|
|
- struct pqi_ctrl_info *ctrl_info = (struct pqi_ctrl_info *)data;
|
|
|
|
|
|
+ struct pqi_ctrl_info *ctrl_info = from_timer(ctrl_info, t,
|
|
|
|
+ heartbeat_timer);
|
|
|
|
|
|
pqi_check_ctrl_health(ctrl_info);
|
|
pqi_check_ctrl_health(ctrl_info);
|
|
if (pqi_ctrl_offline(ctrl_info))
|
|
if (pqi_ctrl_offline(ctrl_info))
|
|
@@ -2902,8 +2903,6 @@ static void pqi_start_heartbeat_timer(struct pqi_ctrl_info *ctrl_info)
|
|
|
|
|
|
ctrl_info->heartbeat_timer.expires =
|
|
ctrl_info->heartbeat_timer.expires =
|
|
jiffies + PQI_HEARTBEAT_TIMER_INTERVAL;
|
|
jiffies + PQI_HEARTBEAT_TIMER_INTERVAL;
|
|
- ctrl_info->heartbeat_timer.data = (unsigned long)ctrl_info;
|
|
|
|
- ctrl_info->heartbeat_timer.function = pqi_heartbeat_timer_handler;
|
|
|
|
add_timer(&ctrl_info->heartbeat_timer);
|
|
add_timer(&ctrl_info->heartbeat_timer);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -6465,7 +6464,7 @@ static struct pqi_ctrl_info *pqi_alloc_ctrl_info(int numa_node)
|
|
INIT_DELAYED_WORK(&ctrl_info->rescan_work, pqi_rescan_worker);
|
|
INIT_DELAYED_WORK(&ctrl_info->rescan_work, pqi_rescan_worker);
|
|
INIT_DELAYED_WORK(&ctrl_info->update_time_work, pqi_update_time_worker);
|
|
INIT_DELAYED_WORK(&ctrl_info->update_time_work, pqi_update_time_worker);
|
|
|
|
|
|
- init_timer(&ctrl_info->heartbeat_timer);
|
|
|
|
|
|
+ timer_setup(&ctrl_info->heartbeat_timer, pqi_heartbeat_timer_handler, 0);
|
|
INIT_WORK(&ctrl_info->ctrl_offline_work, pqi_ctrl_offline_worker);
|
|
INIT_WORK(&ctrl_info->ctrl_offline_work, pqi_ctrl_offline_worker);
|
|
|
|
|
|
sema_init(&ctrl_info->sync_request_sem,
|
|
sema_init(&ctrl_info->sync_request_sem,
|