From patchwork Wed Oct 2 10:49:00 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Gordeev X-Patchwork-Id: 280130 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id C1DB82C0C8F for ; Thu, 3 Oct 2013 04:08:14 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755941Ab3JBSHr (ORCPT ); Wed, 2 Oct 2013 14:07:47 -0400 Received: from 221-186-24-89.in-addr.arpa ([89.24.186.221]:27372 "EHLO dhcp-26-207.brq.redhat.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1755524Ab3JBSHp (ORCPT ); Wed, 2 Oct 2013 14:07:45 -0400 Received: from dhcp-26-207.brq.redhat.com (localhost [127.0.0.1]) by dhcp-26-207.brq.redhat.com (8.14.5/8.14.5) with ESMTP id r92AvcXb002631; Wed, 2 Oct 2013 12:57:38 +0200 Received: (from agordeev@localhost) by dhcp-26-207.brq.redhat.com (8.14.5/8.14.5/Submit) id r92AvZg9002628; Wed, 2 Oct 2013 12:57:35 +0200 From: Alexander Gordeev To: linux-kernel@vger.kernel.org Cc: Alexander Gordeev , Bjorn Helgaas , Ralf Baechle , Michael Ellerman , Benjamin Herrenschmidt , Martin Schwidefsky , Ingo Molnar , Tejun Heo , Dan Williams , Andy King , Jon Mason , Matt Porter , stable@vger.kernel.org, linux-pci@vger.kernel.org, linux-mips@linux-mips.org, linuxppc-dev@lists.ozlabs.org, linux390@de.ibm.com, linux-s390@vger.kernel.org, x86@kernel.org, linux-ide@vger.kernel.org, iss_storagedev@hp.com, linux-nvme@lists.infradead.org, linux-rdma@vger.kernel.org, netdev@vger.kernel.org, e1000-devel@lists.sourceforge.net, linux-driver@qlogic.com, Solarflare linux maintainers , "VMware, Inc." , linux-scsi@vger.kernel.org Subject: [PATCH RFC 44/77] lpfc: Make MSI-X initialization routine more readable Date: Wed, 2 Oct 2013 12:49:00 +0200 Message-Id: X-Mailer: git-send-email 1.7.7.6 In-Reply-To: References: Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Signed-off-by: Alexander Gordeev --- drivers/scsi/lpfc/lpfc_init.c | 23 +++++++++++------------ 1 files changed, 11 insertions(+), 12 deletions(-) diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c index 0ec8008..0cfaf20 100644 --- a/drivers/scsi/lpfc/lpfc_init.c +++ b/drivers/scsi/lpfc/lpfc_init.c @@ -8633,10 +8633,6 @@ lpfc_sli4_enable_msix(struct lpfc_hba *phba) { int vectors, rc, index; - /* Set up MSI-X multi-message vectors */ - for (index = 0; index < phba->cfg_fcp_io_channel; index++) - phba->sli4_hba.msix_entries[index].entry = index; - /* Configure MSI-X capability structure */ vectors = phba->cfg_fcp_io_channel; @@ -8650,14 +8646,14 @@ lpfc_sli4_enable_msix(struct lpfc_hba *phba) goto msg_fail_out; } + /* Set up MSI-X multi-message vectors */ + for (index = 0; index < vectors; index++) + phba->sli4_hba.msix_entries[index].entry = index; + rc = pci_enable_msix(phba->pcidev, phba->sli4_hba.msix_entries, vectors); - if (rc) { -msg_fail_out: - lpfc_printf_log(phba, KERN_INFO, LOG_INIT, - "0484 PCI enable MSI-X failed (%d)\n", rc); - goto vec_fail_out; - } + if (rc) + goto msg_fail_out; /* Log MSI-X vector assignment */ for (index = 0; index < vectors; index++) @@ -8697,7 +8693,7 @@ msg_fail_out: } lpfc_sli4_set_affinity(phba, vectors); - return rc; + return 0; cfg_fail_out: /* free the irq already requested */ @@ -8710,8 +8706,11 @@ cfg_fail_out: /* Unconfigure MSI-X capability structure */ pci_disable_msix(phba->pcidev); + return rc; -vec_fail_out: +msg_fail_out: + lpfc_printf_log(phba, KERN_INFO, LOG_INIT, + "0484 PCI enable MSI-X failed (%d)\n", rc); return rc; }