Commit 33cc559a authored by Tomas Jasek's avatar Tomas Jasek Committed by Martin K. Petersen
Browse files

scsi: lpfc: replace init_timer by setup_timer 



This patch shortens every init_timer in lpfc module followed by function
and data assignment using setup_timer.  This is purely cleanup patch, it
does not add new functionality nor remove any existing functionality.

An init_timer call in this form:

    init_timer(&vport->fc_disctmo);
    vport->fc_disctmo.function = lpfc_disc_timeout;
    vport->fc_disctmo.data = vport;

is shortened to:

    setup_timer(&vport->fc_disctmo, lpfc_disc_timeout, vport);

It increases readability and reduces chances of mistakes done by
developers.

Signed-off-by: default avatarTomas Jasek <tomsik68@gmail.com>
Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Cc: James Smart <james.smart@broadcom.com>
Cc: Dick Kennedy <dick.kennedy@broadcom.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>
Acked-by: default avatarJames Smart <james.smart@broadcom.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent fd2b18b4

drivers/scsi/lpfc/lpfc_hbadisc.c

+2 −3
Original line number Diff line number Diff line
@@ -4344,9 +4344,8 @@ lpfc_initialize_node(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, 
{

	INIT_LIST_HEAD(&ndlp->els_retry_evt.evt_listp);

	INIT_LIST_HEAD(&ndlp->dev_loss_evt.evt_listp);

	init_timer(&ndlp->nlp_delayfunc);

	ndlp->nlp_delayfunc.function = lpfc_els_retry_delay;

	ndlp->nlp_delayfunc.data = (unsigned long)ndlp;

	setup_timer(&ndlp->nlp_delayfunc, lpfc_els_retry_delay,

			(unsigned long)ndlp);

	ndlp->nlp_DID = did;

	ndlp->vport = vport;

	ndlp->phba = vport->phba;

drivers/scsi/lpfc/lpfc_init.c

+17 −30
Original line number Diff line number Diff line
@@ -3734,17 +3734,14 @@ lpfc_create_port(struct lpfc_hba *phba, int instance, struct device *dev) 
	INIT_LIST_HEAD(&vport->rcv_buffer_list);

	spin_lock_init(&vport->work_port_lock);



	init_timer(&vport->fc_disctmo);

	vport->fc_disctmo.function = lpfc_disc_timeout;

	vport->fc_disctmo.data = (unsigned long)vport;

	setup_timer(&vport->fc_disctmo, lpfc_disc_timeout,

			(unsigned long)vport);



	init_timer(&vport->els_tmofunc);

	vport->els_tmofunc.function = lpfc_els_timeout;

	vport->els_tmofunc.data = (unsigned long)vport;

	setup_timer(&vport->els_tmofunc, lpfc_els_timeout,

			(unsigned long)vport);



	init_timer(&vport->delayed_disc_tmo);

	vport->delayed_disc_tmo.function = lpfc_delayed_disc_tmo;

	vport->delayed_disc_tmo.data = (unsigned long)vport;

	setup_timer(&vport->delayed_disc_tmo, lpfc_delayed_disc_tmo,

			(unsigned long)vport);



	error = scsi_add_host_with_dma(shost, dev, &phba->pcidev->dev);

	if (error)
@@ -5406,21 +5403,15 @@ lpfc_setup_driver_resource_phase1(struct lpfc_hba *phba) 
	INIT_LIST_HEAD(&phba->luns);



	/* MBOX heartbeat timer */

	init_timer(&psli->mbox_tmo);

	psli->mbox_tmo.function = lpfc_mbox_timeout;

	psli->mbox_tmo.data = (unsigned long) phba;

	setup_timer(&psli->mbox_tmo, lpfc_mbox_timeout, (unsigned long)phba);

	/* Fabric block timer */

	init_timer(&phba->fabric_block_timer);

	phba->fabric_block_timer.function = lpfc_fabric_block_timeout;

	phba->fabric_block_timer.data = (unsigned long) phba;

	setup_timer(&phba->fabric_block_timer, lpfc_fabric_block_timeout,

			(unsigned long)phba);

	/* EA polling mode timer */

	init_timer(&phba->eratt_poll);

	phba->eratt_poll.function = lpfc_poll_eratt;

	phba->eratt_poll.data = (unsigned long) phba;

	setup_timer(&phba->eratt_poll, lpfc_poll_eratt,

			(unsigned long)phba);

	/* Heartbeat timer */

	init_timer(&phba->hb_tmofunc);

	phba->hb_tmofunc.function = lpfc_hb_timeout;

	phba->hb_tmofunc.data = (unsigned long)phba;

	setup_timer(&phba->hb_tmofunc, lpfc_hb_timeout, (unsigned long)phba);



	return 0;

}
@@ -5446,9 +5437,8 @@ lpfc_sli_driver_resource_setup(struct lpfc_hba *phba) 
	 */



	/* FCP polling mode timer */

	init_timer(&phba->fcp_poll_timer);

	phba->fcp_poll_timer.function = lpfc_poll_timeout;

	phba->fcp_poll_timer.data = (unsigned long) phba;

	setup_timer(&phba->fcp_poll_timer, lpfc_poll_timeout,

			(unsigned long)phba);



	/* Host attention work mask setup */

	phba->work_ha_mask = (HA_ERATT | HA_MBATT | HA_LATT);
@@ -5617,14 +5607,11 @@ lpfc_sli4_driver_resource_setup(struct lpfc_hba *phba) 
	 * Initialize timers used by driver

	 */



	init_timer(&phba->rrq_tmr);

	phba->rrq_tmr.function = lpfc_rrq_timeout;

	phba->rrq_tmr.data = (unsigned long)phba;

	setup_timer(&phba->rrq_tmr, lpfc_rrq_timeout, (unsigned long)phba);



	/* FCF rediscover timer */

	init_timer(&phba->fcf.redisc_wait);

	phba->fcf.redisc_wait.function = lpfc_sli4_fcf_redisc_wait_tmo;

	phba->fcf.redisc_wait.data = (unsigned long)phba;

	setup_timer(&phba->fcf.redisc_wait, lpfc_sli4_fcf_redisc_wait_tmo,

			(unsigned long)phba);



	/*

	 * Control structure for handling external multi-buffer mailbox

CRA Git | Maintained and supported by SUSTech CRA and CCSE