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

Commit d744644a authored by Kees Cook's avatar Kees Cook
Browse files

scsi: qla4xxx: 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: QLogic-Storage-Upstream@qlogic.com
Cc: "James E.J. Bottomley" <jejb@linux.vnet.ibm.com>
Cc: "Martin K. Petersen" <martin.petersen@oracle.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 avatarManish Rangankar <Manish.Rangankar@cavium.com>
parent 77570eed

drivers/scsi/qla4xxx/ql4_os.c

+6 −6
Original line number Diff line number Diff line
@@ -3955,16 +3955,15 @@ void qla4xxx_update_session_conn_param(struct scsi_qla_host *ha, 
/*

 * Timer routines

 */

static void qla4xxx_timer(struct timer_list *t);



static void qla4xxx_start_timer(struct scsi_qla_host *ha, void *func,

static void qla4xxx_start_timer(struct scsi_qla_host *ha,

				unsigned long interval)

{

	DEBUG(printk("scsi: %s: Starting timer thread for adapter %d\n",

		     __func__, ha->host->host_no));

	init_timer(&ha->timer);

	timer_setup(&ha->timer, qla4xxx_timer, 0);

	ha->timer.expires = jiffies + interval * HZ;

	ha->timer.data = (unsigned long)ha;

	ha->timer.function = (void (*)(unsigned long))func;

	add_timer(&ha->timer);

	ha->timer_active = 1;

}
@@ -4508,8 +4507,9 @@ static void qla4xxx_check_relogin_flash_ddb(struct iscsi_cls_session *cls_sess) 
 * qla4xxx_timer - checks every second for work to do.

 * @ha: Pointer to host adapter structure.

 **/

static void qla4xxx_timer(struct scsi_qla_host *ha)

static void qla4xxx_timer(struct timer_list *t)

{

	struct scsi_qla_host *ha = from_timer(ha, t, timer);

	int start_dpc = 0;

	uint16_t w;
@@ -8805,7 +8805,7 @@ static int qla4xxx_probe_adapter(struct pci_dev *pdev, 
	ha->isp_ops->enable_intrs(ha);



	/* Start timer thread. */

	qla4xxx_start_timer(ha, qla4xxx_timer, 1);

	qla4xxx_start_timer(ha, 1);



	set_bit(AF_INIT_DONE, &ha->flags);