From patchwork Wed Jul 22 16:49:16 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: rajinikanth.pandurangan@pmcs.com X-Patchwork-Id: 6845381 Return-Path: X-Original-To: patchwork-linux-scsi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 7135A9F380 for ; Wed, 22 Jul 2015 16:50:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 79E8820692 for ; Wed, 22 Jul 2015 16:50:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A080D206A7 for ; Wed, 22 Jul 2015 16:50:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965570AbbGVQuY (ORCPT ); Wed, 22 Jul 2015 12:50:24 -0400 Received: from bby1mta03.pmc-sierra.com ([216.241.235.118]:57077 "EHLO bby1mta03.pmc-sierra.bc.ca" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965440AbbGVQuV (ORCPT ); Wed, 22 Jul 2015 12:50:21 -0400 Received: from bby1mta03.pmc-sierra.bc.ca (localhost.pmc-sierra.bc.ca [127.0.0.1]) by localhost (Postfix) with SMTP id 6E415107095F; Wed, 22 Jul 2015 09:50:21 -0700 (PDT) Received: from smtp.pmcs.com (bby1cas01.pmc-sierra.internal [216.241.227.142]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by bby1mta03.pmc-sierra.bc.ca (Postfix) with ESMTP id 5E2CB107090D; Wed, 22 Jul 2015 09:50:21 -0700 (PDT) Received: from localhost (216.241.227.4) by bby1cas01.pmc-sierra.internal (216.241.227.142) with Microsoft SMTP Server (TLS) id 14.3.123.3; Wed, 22 Jul 2015 09:50:19 -0700 From: To: , CC: , , , , , , Subject: [PATCH V5 10/11] [SCSI] aacraid: Replace pci_enable_msix() with pci_enable_msix_range() Date: Wed, 22 Jul 2015 09:49:16 -0700 Message-ID: <1437583757-5449-11-git-send-email-rajinikanth.pandurangan@pmcs.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1437583757-5449-1-git-send-email-rajinikanth.pandurangan@pmcs.com> References: <1437583757-5449-1-git-send-email-rajinikanth.pandurangan@pmcs.com> MIME-Version: 1.0 X-Originating-IP: [216.241.227.4] DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pmcs.com; h=from:to:cc:subject:date:message-id:in-reply-to:references:mime-version:content-type; s=default; bh=yzeUPpV5UQNcWyRucPdXG/j9YRAZxRlZ/9Ne8Ytn2so=; b=LJ4lLdnAFWsQYhPuZPvhICznss0mWCYKiuzPiHP2vmWA8mp2M3zHTUHPVcHtZB4z1NiJR/oTVrEzAwXwFWSrdia0IbM2sqfopaPvA5d9QeuQzpYmfccKpC9gQ75cUnmR/QRl2Ad91sYXfw5FjW7zMQ76SH2qdmiUThHv2p9FmAU= Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Spam-Status: No, score=-8.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham 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 From: Rajinikanth Pandurangan Description: As pci_enable_msix() deprecated, replaced with pci_enable_msix_range() V4 Reviewed/commented by: Tomas Henzl Changes from V4: Changed to 1 as minimum msix range in pci_enable_msix_range() to match with original code. Signed-off-by: Rajinikanth Pandurangan Reviewed-by: Tomas Henzl Reviewed-by: Tomas Henzl Reviewed-by: Tomas Henzl --- drivers/scsi/aacraid/comminit.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/drivers/scsi/aacraid/comminit.c b/drivers/scsi/aacraid/comminit.c index b4b6088..a02cfb3 100644 --- a/drivers/scsi/aacraid/comminit.c +++ b/drivers/scsi/aacraid/comminit.c @@ -338,7 +338,7 @@ static int aac_comm_init(struct aac_dev * dev) void aac_define_int_mode(struct aac_dev *dev) { - int i, msi_count; + int i, msi_count, min_msix; msi_count = i = 0; /* max. vectors from GET_COMM_PREFERRED_SETTINGS */ @@ -366,22 +366,14 @@ void aac_define_int_mode(struct aac_dev *dev) if (msi_count > 1 && pci_find_capability(dev->pdev, PCI_CAP_ID_MSIX)) { - i = pci_enable_msix(dev->pdev, + min_msix = 1; + i = pci_enable_msix_range(dev->pdev, dev->msixentry, + min_msix, msi_count); - /* Check how many MSIX vectors are allocated */ - if (i >= 0) { + if (i > 0) { dev->msi_enabled = 1; - if (i) { - msi_count = i; - if (pci_enable_msix(dev->pdev, - dev->msixentry, - msi_count)) { - dev->msi_enabled = 0; - printk(KERN_ERR "%s%d: MSIX not supported!! Will try MSI 0x%x.\n", - dev->name, dev->id, i); - } - } + msi_count = i; } else { dev->msi_enabled = 0; printk(KERN_ERR "%s%d: MSIX not supported!! Will try MSI 0x%x.\n",