mirror of
https://github.com/torvalds/linux
synced 2024-10-17 08:46:50 +00:00
megaraid: 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() or pci_enable_msi_exact() and pci_enable_msix_range() or pci_enable_msix_exact() interfaces. Signed-off-by: Alexander Gordeev <agordeev@redhat.com> Acked-by: Kashyap Desai <Kashyap.desai@avagotech.com> Cc: Neela Syam Kolli <megaraidlinux@lsi.com> Cc: linux-scsi@vger.kernel.org Cc: linux-pci@vger.kernel.org Signed-off-by: Christoph Hellwig <hch@lst.de>
This commit is contained in:
parent
dd0881281d
commit
8ae80ed173
|
@ -4103,18 +4103,12 @@ static int megasas_init_fw(struct megasas_instance *instance)
|
||||||
(unsigned int)num_online_cpus());
|
(unsigned int)num_online_cpus());
|
||||||
for (i = 0; i < instance->msix_vectors; i++)
|
for (i = 0; i < instance->msix_vectors; i++)
|
||||||
instance->msixentry[i].entry = i;
|
instance->msixentry[i].entry = i;
|
||||||
i = pci_enable_msix(instance->pdev, instance->msixentry,
|
i = pci_enable_msix_range(instance->pdev, instance->msixentry,
|
||||||
instance->msix_vectors);
|
1, instance->msix_vectors);
|
||||||
if (i >= 0) {
|
if (i)
|
||||||
if (i) {
|
|
||||||
if (!pci_enable_msix(instance->pdev,
|
|
||||||
instance->msixentry, i))
|
|
||||||
instance->msix_vectors = i;
|
instance->msix_vectors = i;
|
||||||
else
|
else
|
||||||
instance->msix_vectors = 0;
|
instance->msix_vectors = 0;
|
||||||
}
|
|
||||||
} else
|
|
||||||
instance->msix_vectors = 0;
|
|
||||||
|
|
||||||
dev_info(&instance->pdev->dev, "[scsi%d]: FW supports"
|
dev_info(&instance->pdev->dev, "[scsi%d]: FW supports"
|
||||||
"<%d> MSIX vector,Online CPUs: <%d>,"
|
"<%d> MSIX vector,Online CPUs: <%d>,"
|
||||||
|
@ -5133,7 +5127,7 @@ megasas_resume(struct pci_dev *pdev)
|
||||||
|
|
||||||
/* Now re-enable MSI-X */
|
/* Now re-enable MSI-X */
|
||||||
if (instance->msix_vectors &&
|
if (instance->msix_vectors &&
|
||||||
pci_enable_msix(instance->pdev, instance->msixentry,
|
pci_enable_msix_exact(instance->pdev, instance->msixentry,
|
||||||
instance->msix_vectors))
|
instance->msix_vectors))
|
||||||
goto fail_reenable_msix;
|
goto fail_reenable_msix;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue