Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753393AbaBDLRM (ORCPT ); Tue, 4 Feb 2014 06:17:12 -0500 Received: from mx1.redhat.com ([209.132.183.28]:52424 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754479AbaBDLQw (ORCPT ); Tue, 4 Feb 2014 06:16:52 -0500 From: Alexander Gordeev To: linux-kernel@vger.kernel.org Cc: Alexander Gordeev , "Stephen M. Cameron" , iss_storagedev@hp.com, linux-scsi@vger.kernel.org, linux-pci@vger.kernel.org Subject: [PATCH 09/22] hpsa: Use pci_enable_msix_range() Date: Tue, 4 Feb 2014 12:16:55 +0100 Message-Id: <0c2c5eba34a7903d36ac2908d608bc2d47a491a7.1391512266.git.agordeev@redhat.com> In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org As result of deprecation of MSI-X/MSI enablement functions pci_enable_msix() and pci_enable_msi_block() all drivers using these two interfaces need to be updated to use the new pci_enable_msi_range() and pci_enable_msix_range() interfaces. Signed-off-by: Alexander Gordeev Cc: "Stephen M. Cameron" Cc: iss_storagedev@hp.com Cc: linux-scsi@vger.kernel.org Cc: linux-pci@vger.kernel.org --- drivers/scsi/hpsa.c | 20 +++++++------------- 1 files changed, 7 insertions(+), 13 deletions(-) diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c index 68eec7a..3323628 100644 --- a/drivers/scsi/hpsa.c +++ b/drivers/scsi/hpsa.c @@ -4169,23 +4169,17 @@ static void hpsa_interrupt_mode(struct ctlr_info *h) goto default_int_mode; if (pci_find_capability(h->pdev, PCI_CAP_ID_MSIX)) { dev_info(&h->pdev->dev, "MSIX\n"); - err = pci_enable_msix(h->pdev, hpsa_msix_entries, - MAX_REPLY_QUEUES); - if (!err) { - for (i = 0; i < MAX_REPLY_QUEUES; i++) - h->intr[i] = hpsa_msix_entries[i].vector; - h->msix_vector = 1; - return; - } - if (err > 0) { - dev_warn(&h->pdev->dev, "only %d MSI-X vectors " - "available\n", err); - goto single_msi_mode; - } else { + err = pci_enable_msix_range(h->pdev, hpsa_msix_entries, + MAX_REPLY_QUEUES, MAX_REPLY_QUEUES); + if (err < 0) { dev_warn(&h->pdev->dev, "MSI-X init failed %d\n", err); goto single_msi_mode; } + for (i = 0; i < MAX_REPLY_QUEUES; i++) + h->intr[i] = hpsa_msix_entries[i].vector; + h->msix_vector = 1; + return; } single_msi_mode: if (pci_find_capability(h->pdev, PCI_CAP_ID_MSI)) { -- 1.7.7.6 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/