diff options
author | James Smart <jsmart2021@gmail.com> | 2017-03-04 12:30:35 -0500 |
---|---|---|
committer | Martin K. Petersen <martin.petersen@oracle.com> | 2017-03-06 23:04:22 -0500 |
commit | da6b044a28fe603fe2c3fd908cda8150aa0abe74 (patch) | |
tree | f6a4896e88cad28b422420791b653990d5f4524d | |
parent | 43140ca68d1a071ddbe92f10a3256e01701ae390 (diff) |
scsi: lpfc: correct double print
Correct a merge error that had debug data printed twice for the
same element
Signed-off-by: Dick Kennedy <dick.kennedy@broadcom.com>
Signed-off-by: James Smart <james.smart@broadcom.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
-rw-r--r-- | drivers/scsi/lpfc/lpfc_debugfs.c | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/drivers/scsi/lpfc/lpfc_debugfs.c b/drivers/scsi/lpfc/lpfc_debugfs.c index 9f4798e9d938..913eed822cb8 100644 --- a/drivers/scsi/lpfc/lpfc_debugfs.c +++ b/drivers/scsi/lpfc/lpfc_debugfs.c | |||
@@ -3653,17 +3653,6 @@ lpfc_idiag_queacc_write(struct file *file, const char __user *buf, | |||
3653 | idiag.ptr_private = phba->sli4_hba.nvmels_cq; | 3653 | idiag.ptr_private = phba->sli4_hba.nvmels_cq; |
3654 | goto pass_check; | 3654 | goto pass_check; |
3655 | } | 3655 | } |
3656 | /* NVME LS complete queue */ | ||
3657 | if (phba->sli4_hba.nvmels_cq && | ||
3658 | phba->sli4_hba.nvmels_cq->queue_id == queid) { | ||
3659 | /* Sanity check */ | ||
3660 | rc = lpfc_idiag_que_param_check( | ||
3661 | phba->sli4_hba.nvmels_cq, index, count); | ||
3662 | if (rc) | ||
3663 | goto error_out; | ||
3664 | idiag.ptr_private = phba->sli4_hba.nvmels_cq; | ||
3665 | goto pass_check; | ||
3666 | } | ||
3667 | /* FCP complete queue */ | 3656 | /* FCP complete queue */ |
3668 | if (phba->sli4_hba.fcp_cq) { | 3657 | if (phba->sli4_hba.fcp_cq) { |
3669 | for (qidx = 0; qidx < phba->cfg_fcp_io_channel; | 3658 | for (qidx = 0; qidx < phba->cfg_fcp_io_channel; |
@@ -3738,17 +3727,6 @@ lpfc_idiag_queacc_write(struct file *file, const char __user *buf, | |||
3738 | idiag.ptr_private = phba->sli4_hba.nvmels_wq; | 3727 | idiag.ptr_private = phba->sli4_hba.nvmels_wq; |
3739 | goto pass_check; | 3728 | goto pass_check; |
3740 | } | 3729 | } |
3741 | /* NVME LS work queue */ | ||
3742 | if (phba->sli4_hba.nvmels_wq && | ||
3743 | phba->sli4_hba.nvmels_wq->queue_id == queid) { | ||
3744 | /* Sanity check */ | ||
3745 | rc = lpfc_idiag_que_param_check( | ||
3746 | phba->sli4_hba.nvmels_wq, index, count); | ||
3747 | if (rc) | ||
3748 | goto error_out; | ||
3749 | idiag.ptr_private = phba->sli4_hba.nvmels_wq; | ||
3750 | goto pass_check; | ||
3751 | } | ||
3752 | /* FCP work queue */ | 3730 | /* FCP work queue */ |
3753 | if (phba->sli4_hba.fcp_wq) { | 3731 | if (phba->sli4_hba.fcp_wq) { |
3754 | for (qidx = 0; qidx < phba->cfg_fcp_io_channel; | 3732 | for (qidx = 0; qidx < phba->cfg_fcp_io_channel; |