diff options
author | Alexander Gordeev <agordeev@redhat.com> | 2014-04-21 11:19:32 -0400 |
---|---|---|
committer | Jens Axboe <axboe@fb.com> | 2014-04-21 21:02:08 -0400 |
commit | 24cddb83b4ae3a601f807e96cde9bf24fb90e5f5 (patch) | |
tree | 9571baef93657323880413fef827cd1f69a6fd48 /drivers/block/cciss.c | |
parent | 01aad3f0de67281f099e253b404fe08db2814c28 (diff) |
cciss: Use pci_enable_msix_exact() instead of pci_enable_msix()
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() or pci_enable_msi_exact()
and pci_enable_msix_range() or pci_enable_msix_exact()
interfaces.
Signed-off-by: Alexander Gordeev <agordeev@redhat.com>
Cc: Mike Miller <mike.miller@hp.com>
Cc: iss_storagedev@hp.com
Cc: Jens Axboe <axboe@kernel.dk>
Cc: linux-pci@vger.kernel.org
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/block/cciss.c')
-rw-r--r-- | drivers/block/cciss.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c index 73894ca33956..4595c22f33f7 100644 --- a/drivers/block/cciss.c +++ b/drivers/block/cciss.c | |||
@@ -4080,7 +4080,7 @@ static void cciss_interrupt_mode(ctlr_info_t *h) | |||
4080 | goto default_int_mode; | 4080 | goto default_int_mode; |
4081 | 4081 | ||
4082 | if (pci_find_capability(h->pdev, PCI_CAP_ID_MSIX)) { | 4082 | if (pci_find_capability(h->pdev, PCI_CAP_ID_MSIX)) { |
4083 | err = pci_enable_msix(h->pdev, cciss_msix_entries, 4); | 4083 | err = pci_enable_msix_exact(h->pdev, cciss_msix_entries, 4); |
4084 | if (!err) { | 4084 | if (!err) { |
4085 | h->intr[0] = cciss_msix_entries[0].vector; | 4085 | h->intr[0] = cciss_msix_entries[0].vector; |
4086 | h->intr[1] = cciss_msix_entries[1].vector; | 4086 | h->intr[1] = cciss_msix_entries[1].vector; |
@@ -4088,10 +4088,6 @@ static void cciss_interrupt_mode(ctlr_info_t *h) | |||
4088 | h->intr[3] = cciss_msix_entries[3].vector; | 4088 | h->intr[3] = cciss_msix_entries[3].vector; |
4089 | h->msix_vector = 1; | 4089 | h->msix_vector = 1; |
4090 | return; | 4090 | return; |
4091 | } | ||
4092 | if (err > 0) { | ||
4093 | dev_warn(&h->pdev->dev, | ||
4094 | "only %d MSI-X vectors available\n", err); | ||
4095 | } else { | 4091 | } else { |
4096 | dev_warn(&h->pdev->dev, | 4092 | dev_warn(&h->pdev->dev, |
4097 | "MSI-X init failed %d\n", err); | 4093 | "MSI-X init failed %d\n", err); |