mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-02 02:56:40 +07: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,17 +4103,11 @@ static int megasas_init_fw(struct megasas_instance *instance)
|
||||
(unsigned int)num_online_cpus());
|
||||
for (i = 0; i < instance->msix_vectors; i++)
|
||||
instance->msixentry[i].entry = i;
|
||||
i = pci_enable_msix(instance->pdev, instance->msixentry,
|
||||
instance->msix_vectors);
|
||||
if (i >= 0) {
|
||||
if (i) {
|
||||
if (!pci_enable_msix(instance->pdev,
|
||||
instance->msixentry, i))
|
||||
instance->msix_vectors = i;
|
||||
else
|
||||
instance->msix_vectors = 0;
|
||||
}
|
||||
} else
|
||||
i = pci_enable_msix_range(instance->pdev, instance->msixentry,
|
||||
1, instance->msix_vectors);
|
||||
if (i)
|
||||
instance->msix_vectors = i;
|
||||
else
|
||||
instance->msix_vectors = 0;
|
||||
|
||||
dev_info(&instance->pdev->dev, "[scsi%d]: FW supports"
|
||||
@ -5133,8 +5127,8 @@ megasas_resume(struct pci_dev *pdev)
|
||||
|
||||
/* Now re-enable MSI-X */
|
||||
if (instance->msix_vectors &&
|
||||
pci_enable_msix(instance->pdev, instance->msixentry,
|
||||
instance->msix_vectors))
|
||||
pci_enable_msix_exact(instance->pdev, instance->msixentry,
|
||||
instance->msix_vectors))
|
||||
goto fail_reenable_msix;
|
||||
|
||||
switch (instance->pdev->device) {
|
||||
|
Loading…
Reference in New Issue
Block a user