lkml.org 
[lkml]   [2014]   [Jul]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 RESEND 11/23] lpfc: Remove superfluous call to pci_disable_msix()
    Date
    There is no need to call pci_disable_msix() in case
    the previous call to pci_enable_msix() failed

    Signed-off-by: Alexander Gordeev <agordeev@redhat.com>
    Cc: James Smart <james.smart@emulex.com>
    Cc: linux-scsi@vger.kernel.org
    Cc: linux-pci@vger.kernel.org
    Acked-by: James Smart <james.smart@emulex.com>
    ---
    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 06f9a5b..a5769a9 100644
    --- a/drivers/scsi/lpfc/lpfc_init.c
    +++ b/drivers/scsi/lpfc/lpfc_init.c
    @@ -8242,7 +8242,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,
    @@ -8320,6 +8320,8 @@ irq_fail_out:
    msi_fail_out:
    /* Unconfigure MSI-X capability structure */
    pci_disable_msix(phba->pcidev);
    +
    +vec_fail_out:
    return rc;
    }

    @@ -8812,7 +8814,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 */
    @@ -8875,9 +8877,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;
    }

    --
    1.7.7.6


    \
     
     \ /
      Last update: 2014-07-18 17:21    [W:4.079 / U:0.244 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site