From: Alexander Gordeev <agordeev@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: Alexander Gordeev <agordeev@redhat.com>,
xjtuwjp@gmail.com, lindar_liu@usish.com,
linux-scsi@vger.kernel.org, linux-pci@vger.kernel.org
Subject: [PATCH 17/22] pm8001: Use pci_enable_msix_range()
Date: Tue, 4 Feb 2014 12:17:03 +0100 [thread overview]
Message-ID: <b6ab9b0f70327c1a394dd8923576dfcae571a5b3.1391512266.git.agordeev@redhat.com> (raw)
In-Reply-To: <cover.1391512266.git.agordeev@redhat.com>
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 <agordeev@redhat.com>
Cc: xjtuwjp@gmail.com
Cc: lindar_liu@usish.com
Cc: linux-scsi@vger.kernel.org
Cc: linux-pci@vger.kernel.org
---
drivers/scsi/pm8001/pm8001_init.c | 47 +++++++++++++++++++------------------
1 files changed, 24 insertions(+), 23 deletions(-)
diff --git a/drivers/scsi/pm8001/pm8001_init.c b/drivers/scsi/pm8001/pm8001_init.c
index efffbb9..2d4b06e 100644
--- a/drivers/scsi/pm8001/pm8001_init.c
+++ b/drivers/scsi/pm8001/pm8001_init.c
@@ -724,34 +724,35 @@ static u32 pm8001_setup_msix(struct pm8001_hba_info *pm8001_ha)
sizeof(pm8001_ha->msix_entries[0]);
for (i = 0; i < max_entry ; i++)
pm8001_ha->msix_entries[i].entry = i;
- rc = pci_enable_msix(pm8001_ha->pdev, pm8001_ha->msix_entries,
- number_of_intr);
+ rc = pci_enable_msix_range(pm8001_ha->pdev, pm8001_ha->msix_entries,
+ number_of_intr, number_of_intr);
pm8001_ha->number_of_intr = number_of_intr;
- if (!rc) {
- PM8001_INIT_DBG(pm8001_ha, pm8001_printk(
- "pci_enable_msix request ret:%d no of intr %d\n",
- rc, pm8001_ha->number_of_intr));
-
-
- for (i = 0; i < number_of_intr; i++) {
- snprintf(intr_drvname[i], sizeof(intr_drvname[0]),
- DRV_NAME"%d", i);
- pm8001_ha->irq_vector[i].irq_id = i;
- pm8001_ha->irq_vector[i].drv_inst = pm8001_ha;
-
- rc = request_irq(pm8001_ha->msix_entries[i].vector,
- pm8001_interrupt_handler_msix, flag,
- intr_drvname[i], &(pm8001_ha->irq_vector[i]));
- if (rc) {
- for (j = 0; j < i; j++)
- free_irq(
- pm8001_ha->msix_entries[j].vector,
+ if (rc < 0)
+ return rc;
+
+ PM8001_INIT_DBG(pm8001_ha, pm8001_printk(
+ "pci_enable_msix request ret:%d no of intr %d\n",
+ rc, pm8001_ha->number_of_intr));
+
+ for (i = 0; i < number_of_intr; i++) {
+ snprintf(intr_drvname[i], sizeof(intr_drvname[0]),
+ DRV_NAME"%d", i);
+ pm8001_ha->irq_vector[i].irq_id = i;
+ pm8001_ha->irq_vector[i].drv_inst = pm8001_ha;
+
+ rc = request_irq(pm8001_ha->msix_entries[i].vector,
+ pm8001_interrupt_handler_msix, flag,
+ intr_drvname[i], &(pm8001_ha->irq_vector[i]));
+ if (rc) {
+ for (j = 0; j < i; j++) {
+ free_irq(pm8001_ha->msix_entries[j].vector,
&(pm8001_ha->irq_vector[i]));
- pci_disable_msix(pm8001_ha->pdev);
- break;
}
+ pci_disable_msix(pm8001_ha->pdev);
+ break;
}
}
+
return rc;
}
#endif
--
1.7.7.6
next prev parent reply other threads:[~2014-02-04 11:17 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-04 11:16 [PATCH 00/22] scsi: Use pci_enable_msix_range() Alexander Gordeev
2014-02-04 11:16 ` [PATCH 01/22] be2iscsi: " Alexander Gordeev
2014-02-05 4:58 ` Jayamohan Kallickal
2014-02-04 11:16 ` [PATCH 02/22] bfa: Do not call pci_enable_msix() once it failed Alexander Gordeev
2014-02-13 17:39 ` Alexander Gordeev
2014-02-04 11:16 ` [PATCH 03/22] bfa: Cleanup bfad_setup_intr() Alexander Gordeev
2014-02-04 11:16 ` [PATCH 04/22] bfa: Use pci_enable_msix_range() Alexander Gordeev
2014-02-04 11:16 ` [PATCH 05/22] csiostor: Remove superfluous call to pci_disable_msix() Alexander Gordeev
2014-02-04 11:16 ` [PATCH 06/22] csiostor: Use pci_enable_msix_range() Alexander Gordeev
2014-02-04 11:16 ` [PATCH 07/22] fnic: " Alexander Gordeev
2014-02-11 5:00 ` Suma Ramars (sramars)
2014-02-04 11:16 ` [PATCH 08/22] hpsa: Fallback to MSI rather than to INTx if MSI-X failed Alexander Gordeev
2014-02-04 11:16 ` [PATCH 09/22] hpsa: Use pci_enable_msix_range() Alexander Gordeev
2014-02-04 11:16 ` [PATCH 10/22] isci: " Alexander Gordeev
2014-02-06 14:25 ` Dorau, Lukasz
2014-02-04 11:16 ` [PATCH 11/22] lpfc: Remove superfluous call to pci_disable_msix() Alexander Gordeev
2014-02-13 17:46 ` Alexander Gordeev
2014-02-20 15:16 ` James Smart
2014-02-04 11:16 ` [PATCH 12/22] lpfc: Use pci_enable_msix_range() Alexander Gordeev
2014-02-04 11:16 ` [PATCH 13/22] megaraid: " Alexander Gordeev
2014-02-07 11:17 ` Saxena, Sumit
2014-02-04 11:17 ` [PATCH 14/22] mpt2sas: " Alexander Gordeev
2014-02-13 17:47 ` Alexander Gordeev
2014-02-04 11:17 ` [PATCH 15/22] mpt3sas: " Alexander Gordeev
2014-02-04 11:17 ` [PATCH 16/22] pm8001: Fix invalid success return when request_irq() failed Alexander Gordeev
2014-02-04 12:01 ` Jack Wang
2014-02-04 11:17 ` Alexander Gordeev [this message]
2014-02-04 12:04 ` [PATCH 17/22] pm8001: Use pci_enable_msix_range() Jack Wang
2014-02-04 11:17 ` [PATCH 18/22] pmcraid: Get rid of a redundant assignment Alexander Gordeev
2014-02-13 17:49 ` Alexander Gordeev
2014-02-04 11:17 ` [PATCH 19/22] pmcraid: Use pci_enable_msix_range() Alexander Gordeev
2014-02-13 17:55 ` Alexander Gordeev
2014-02-04 11:17 ` [PATCH 20/22] qla2xxx: " Alexander Gordeev
2014-02-25 9:52 ` Saurav Kashyap
2014-02-04 11:17 ` [PATCH 21/22] qla4xxx: " Alexander Gordeev
2014-02-13 17:54 ` Alexander Gordeev
2014-02-18 8:37 ` Vikas Chaudhary
2014-02-04 11:17 ` [PATCH 22/22] vmw_pvscsi: " Alexander Gordeev
2014-02-04 21:47 ` Arvind Kumar
2014-02-19 8:15 ` [PATCH 00/22] scsi: " Alexander Gordeev
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=b6ab9b0f70327c1a394dd8923576dfcae571a5b3.1391512266.git.agordeev@redhat.com \
--to=agordeev@redhat.com \
--cc=lindar_liu@usish.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=xjtuwjp@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).