Commit 24cddb83 authored by Alexander Gordeev's avatar Alexander Gordeev Committed by Jens Axboe
Browse files

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: default avatarAlexander 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: default avatarJens Axboe <axboe@fb.com>
parent 01aad3f0

drivers/block/cciss.c

+1 −5
Original line number Diff line number Diff line
@@ -4080,7 +4080,7 @@ 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);

		err = pci_enable_msix_exact(h->pdev, cciss_msix_entries, 4);

		if (!err) {

			h->intr[0] = cciss_msix_entries[0].vector;

			h->intr[1] = cciss_msix_entries[1].vector;
@@ -4088,10 +4088,6 @@ static void cciss_interrupt_mode(ctlr_info_t *h) 
			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);

		} else {

			dev_warn(&h->pdev->dev,

				"MSI-X init failed %d\n", err);