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

Commit 433c3579 authored by James.Smart@Emulex.Com's avatar James.Smart@Emulex.Com Committed by James Bottomley
Browse files

[SCSI] lpfc: Cleanup code in lpfc_get_stats(). 



Cleanup white spaces in argument calls & initializations, prune if
statements, remove casting and remove redundant if checks.

Signed-off-by: default avatarJames Smart <James.Smart@emulex.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent ca61f10a

drivers/scsi/lpfc/lpfc_attr.c

+15 −19
Original line number Original line Diff line number Diff line
@@ -997,18 +997,16 @@ lpfc_get_stats(struct Scsi_Host *shost) 
	pmboxq->context1 = NULL;

	pmboxq->context1 = NULL;





	if ((phba->fc_flag & FC_OFFLINE_MODE) ||

	if ((phba->fc_flag & FC_OFFLINE_MODE) ||

	    (!(psli->sli_flag & LPFC_SLI2_ACTIVE))){

		(!(psli->sli_flag & LPFC_SLI2_ACTIVE)))

		rc = lpfc_sli_issue_mbox(phba, pmboxq, MBX_POLL);

		rc = lpfc_sli_issue_mbox(phba, pmboxq, MBX_POLL);

	} else

	else

		rc = lpfc_sli_issue_mbox_wait(phba, pmboxq, phba->fc_ratov * 2);

		rc = lpfc_sli_issue_mbox_wait(phba, pmboxq, phba->fc_ratov * 2);





	if (rc != MBX_SUCCESS) {

	if (rc != MBX_SUCCESS) {

		if (pmboxq) {

		if (rc == MBX_TIMEOUT)

		if (rc == MBX_TIMEOUT)

			pmboxq->mbox_cmpl = lpfc_sli_def_mbox_cmpl;

			pmboxq->mbox_cmpl = lpfc_sli_def_mbox_cmpl;

		else

		else

			mempool_free(pmboxq, phba->mbox_mem_pool);

			mempool_free(pmboxq, phba->mbox_mem_pool);

		}

		return NULL;

		return NULL;

	}

	}
@@ -1019,24 +1017,22 @@ lpfc_get_stats(struct Scsi_Host *shost) 
	hs->rx_frames = pmb->un.varRdStatus.rcvFrameCnt;

	hs->rx_frames = pmb->un.varRdStatus.rcvFrameCnt;

	hs->rx_words = (pmb->un.varRdStatus.rcvByteCnt * 256);

	hs->rx_words = (pmb->un.varRdStatus.rcvByteCnt * 256);





	memset((void *)pmboxq, 0, sizeof (LPFC_MBOXQ_t));

	memset(pmboxq, 0, sizeof (LPFC_MBOXQ_t));

	pmb->mbxCommand = MBX_READ_LNK_STAT;

	pmb->mbxCommand = MBX_READ_LNK_STAT;

	pmb->mbxOwner = OWN_HOST;

	pmb->mbxOwner = OWN_HOST;

	pmboxq->context1 = NULL;

	pmboxq->context1 = NULL;





	if ((phba->fc_flag & FC_OFFLINE_MODE) ||

	if ((phba->fc_flag & FC_OFFLINE_MODE) ||

	    (!(psli->sli_flag & LPFC_SLI2_ACTIVE))) {

	    (!(psli->sli_flag & LPFC_SLI2_ACTIVE)))

		rc = lpfc_sli_issue_mbox(phba, pmboxq, MBX_POLL);

		rc = lpfc_sli_issue_mbox(phba, pmboxq, MBX_POLL);

	} else

	else

		rc = lpfc_sli_issue_mbox_wait(phba, pmboxq, phba->fc_ratov * 2);

		rc = lpfc_sli_issue_mbox_wait(phba, pmboxq, phba->fc_ratov * 2);





	if (rc != MBX_SUCCESS) {

	if (rc != MBX_SUCCESS) {

		if (pmboxq) {

		if (rc == MBX_TIMEOUT)

		if (rc == MBX_TIMEOUT)

			pmboxq->mbox_cmpl = lpfc_sli_def_mbox_cmpl;

			pmboxq->mbox_cmpl = lpfc_sli_def_mbox_cmpl;

		else

		else

			mempool_free( pmboxq, phba->mbox_mem_pool);

			mempool_free( pmboxq, phba->mbox_mem_pool);

		}

		return NULL;

		return NULL;

	}

	}