Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

skd: Use pci_enable_msix_range() 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() and pci_enable_msix_range()
interfaces.

Signed-off-by: default avatarAlexander Gordeev <agordeev@redhat.com>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Cc: linux-pci@vger.kernel.org
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 1bc5ce5d

drivers/block/skd_main.c

+12 −26
Original line number Diff line number Diff line
@@ -3932,42 +3932,28 @@ static void skd_release_msix(struct skd_device *skdev) 


static int skd_acquire_msix(struct skd_device *skdev)

{

	int i, rc, msix_count = SKD_MAX_MSIX_COUNT;

	int i, rc;

	struct pci_dev *pdev = skdev->pdev;

	struct msix_entry *entries;

	struct skd_msix_entry *qentry;



	entries = kzalloc(sizeof(struct msix_entry) * msix_count, GFP_KERNEL);

	entries = kzalloc(sizeof(struct msix_entry) * SKD_MAX_MSIX_COUNT,

			  GFP_KERNEL);

	if (!entries)

		return -ENOMEM;



	for (i = 0; i < msix_count; i++)

	for (i = 0; i < SKD_MAX_MSIX_COUNT; i++)

		entries[i].entry = i;



	rc = pci_enable_msix(pdev, entries, msix_count);

	if (rc < 0)

		goto msix_out;

	else if (rc) {

		if (rc < SKD_MIN_MSIX_COUNT) {

	rc = pci_enable_msix_range(pdev, entries,

				   SKD_MIN_MSIX_COUNT, SKD_MAX_MSIX_COUNT);

	if (rc < 0) {

		pr_err("(%s): failed to enable MSI-X %d\n",

		       skd_name(skdev), rc);

		goto msix_out;

	}

		pr_debug("%s:%s:%d %s: <%s> allocated %d MSI-X vectors\n",

			 skdev->name, __func__, __LINE__,

			 pci_name(pdev), skdev->name, rc);



		msix_count = rc;

		rc = pci_enable_msix(pdev, entries, msix_count);

		if (rc) {

			pr_err("(%s): failed to enable MSI-X "

			       "support (%d) %d\n",

			       skd_name(skdev), msix_count, rc);

			goto msix_out;

		}

	}



	skdev->msix_count = msix_count;

	skdev->msix_count = rc;

	skdev->msix_entries = kzalloc(sizeof(struct skd_msix_entry) *

				      skdev->msix_count, GFP_KERNEL);

	if (!skdev->msix_entries) {
@@ -4046,8 +4032,8 @@ static int skd_acquire_irq(struct skd_device *skdev) 
	case SKD_IRQ_MSI:

		snprintf(skdev->isr_name, sizeof(skdev->isr_name), "%s%d-msi",

			 DRV_NAME, skdev->devno);

		rc = pci_enable_msi(pdev);

		if (!rc) {

		rc = pci_enable_msi_range(pdev, 1, 1);

		if (rc > 0) {

			rc = devm_request_irq(&pdev->dev, pdev->irq, skd_isr, 0,

					      skdev->isr_name, skdev);

			if (rc) {