From patchwork Wed Feb 19 08:58:14 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Gordeev X-Patchwork-Id: 3679431 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id A5290BF13A for ; Wed, 19 Feb 2014 08:59:14 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D5988201CD for ; Wed, 19 Feb 2014 08:59:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EA8C5200B4 for ; Wed, 19 Feb 2014 08:59:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753089AbaBSI4g (ORCPT ); Wed, 19 Feb 2014 03:56:36 -0500 Received: from mx1.redhat.com ([209.132.183.28]:30681 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751375AbaBSI4e (ORCPT ); Wed, 19 Feb 2014 03:56:34 -0500 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s1J8uVgs032724 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 19 Feb 2014 03:56:31 -0500 Received: from dhcp-26-207.brq.redhat.com (vpn-55-192.rdu2.redhat.com [10.10.55.192]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id s1J8uOYq003605; Wed, 19 Feb 2014 03:56:29 -0500 From: Alexander Gordeev To: linux-kernel@vger.kernel.org Cc: Alexander Gordeev , Mike Miller , iss_storagedev@hp.com, linux-pci@vger.kernel.org Subject: [PATCH 2/9] cciss: Use pci_enable_msix_range() instead of pci_enable_msix() Date: Wed, 19 Feb 2014 09:58:14 +0100 Message-Id: <93bb43ba4d56c17101c7930511851f7e7c3d0c0d.1392799751.git.agordeev@redhat.com> In-Reply-To: References: X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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: Mike Miller Cc: iss_storagedev@hp.com Cc: linux-pci@vger.kernel.org --- drivers/block/cciss.c | 11 +++-------- 1 files changed, 3 insertions(+), 8 deletions(-) diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c index fc5b0a4..5463cb5 100644 --- a/drivers/block/cciss.c +++ b/drivers/block/cciss.c @@ -4080,19 +4080,14 @@ static void cciss_interrupt_mode(ctlr_info_t *h) goto default_int_mode; if (pci_find_capability(h->pdev, PCI_CAP_ID_MSIX)) { - err = pci_enable_msix(h->pdev, cciss_msix_entries, 4); - if (!err) { + err = pci_enable_msix_range(h->pdev, cciss_msix_entries, 4, 4); + if (err > 0) { h->intr[0] = cciss_msix_entries[0].vector; h->intr[1] = cciss_msix_entries[1].vector; h->intr[2] = cciss_msix_entries[2].vector; h->intr[3] = cciss_msix_entries[3].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 { dev_warn(&h->pdev->dev, "MSI-X init failed %d\n", err); @@ -4101,7 +4096,7 @@ static void cciss_interrupt_mode(ctlr_info_t *h) } single_msi_mode: if (pci_find_capability(h->pdev, PCI_CAP_ID_MSI)) { - if (!pci_enable_msi(h->pdev)) + if (pci_enable_msi_range(h->pdev, 1, 1) > 0) h->msi_vector = 1; else dev_warn(&h->pdev->dev, "MSI init failed\n");