Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 74a0f573 authored by Kees Cook's avatar Kees Cook
Browse files

scsi: smartpqi: Convert timers to use timer_setup() 



In preparation for unconditionally passing the struct timer_list pointer to
all timer callbacks, switch to using the new timer_setup() and from_timer()
to pass the timer pointer explicitly.

Cc: "Martin K. Petersen" <martin.petersen@oracle.com>
Cc: Don Brace <don.brace@microsemi.com>
Cc: "James E.J. Bottomley" <jejb@linux.vnet.ibm.com>
Cc: esc.storagedev@microsemi.com
Cc: linux-scsi@vger.kernel.org
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Reviewed-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Acked-by: default avatarDon Brace <don.brace@microsemi.com>
parent 2c4b9637

drivers/scsi/smartpqi/smartpqi_init.c

+4 −5
Original line number Diff line number Diff line
@@ -2860,11 +2860,12 @@ static void pqi_event_worker(struct work_struct *work) 


#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;

	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);

	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 =

		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);

}
@@ -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->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);



	sema_init(&ctrl_info->sync_request_sem,