[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <53061C55.9060708@emulex.com>
Date: Thu, 20 Feb 2014 10:16:37 -0500
From: James Smart <james.smart@...lex.com>
To: Alexander Gordeev <agordeev@...hat.com>
CC: <linux-kernel@...r.kernel.org>, <linux-scsi@...r.kernel.org>,
<linux-pci@...r.kernel.org>
Subject: Re: [PATCH 11/22] lpfc: Remove superfluous call to pci_disable_msix()
Hi Alexander,
The change is fine - but not really necessary. The pci_disable_msix()
call explicitly checks for enablement so it's safe.
It really is a superfluous change - but if James wants to take it:
Acked-by: James Smart <james.smart@...lex.com>
-- james s
On 2/4/2014 6:16 AM, Alexander Gordeev wrote:
> Signed-off-by: Alexander Gordeev <agordeev@...hat.com>
> Cc: James Smart <james.smart@...lex.com>
> Cc: linux-scsi@...r.kernel.org
> Cc: linux-pci@...r.kernel.org
> ---
> drivers/scsi/lpfc/lpfc_init.c | 9 ++++++---
> 1 files changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
> index 68c94cc..a9df97a 100644
> --- a/drivers/scsi/lpfc/lpfc_init.c
> +++ b/drivers/scsi/lpfc/lpfc_init.c
> @@ -8078,7 +8078,7 @@ lpfc_sli_enable_msix(struct lpfc_hba *phba)
> if (rc) {
> lpfc_printf_log(phba, KERN_INFO, LOG_INIT,
> "0420 PCI enable MSI-X failed (%d)\n", rc);
> - goto msi_fail_out;
> + goto vec_fail_out;
> }
> for (i = 0; i < LPFC_MSIX_VECTORS; i++)
> lpfc_printf_log(phba, KERN_INFO, LOG_INIT,
> @@ -8156,6 +8156,8 @@ irq_fail_out:
> msi_fail_out:
> /* Unconfigure MSI-X capability structure */
> pci_disable_msix(phba->pcidev);
> +
> +vec_fail_out:
> return rc;
> }
>
> @@ -8644,7 +8646,7 @@ enable_msix_vectors:
> } else if (rc) {
> lpfc_printf_log(phba, KERN_INFO, LOG_INIT,
> "0484 PCI enable MSI-X failed (%d)\n", rc);
> - goto msi_fail_out;
> + goto vec_fail_out;
> }
>
> /* Log MSI-X vector assignment */
> @@ -8696,9 +8698,10 @@ cfg_fail_out:
> &phba->sli4_hba.fcp_eq_hdl[index]);
> }
>
> -msi_fail_out:
> /* Unconfigure MSI-X capability structure */
> pci_disable_msix(phba->pcidev);
> +
> +vec_fail_out:
> return rc;
> }
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists