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 <agord...@redhat.com>
Cc: Mike Miller <mike.mil...@hp.com>
Cc: iss_storage...@hp.com
Cc: linux-...@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");
--
1.7.7.6
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
