diff options
| author |  Takashi Sakamoto <o-takashi@sakamocchi.jp>
| 2024-03-31 22:50:36 +0900 |
|---|---|---|
| committer | Takashi Sakamoto <o-takashi@sakamocchi.jp>
| 2024-05-06 11:06:04 +0900 |
| commit | b9d9a025bf2fa93d421cc5e54bf1dfaa3a55d60a (patch) | |
| tree | e7e180da530ca57e387519c02c992cb3f2b69866 /drivers/firewire | |
| parent | firewire: ohci: replace request_irq() with request_threaded_irq() (diff) | |
| download | linux-b9d9a025bf2fa93d421cc5e54bf1dfaa3a55d60a.tar.gz linux-b9d9a025bf2fa93d421cc5e54bf1dfaa3a55d60a.tar.bz2 linux-b9d9a025bf2fa93d421cc5e54bf1dfaa3a55d60a.zip | |
firewire: ohci: obsolete usage of deprecated API for MSI
The usage of the pair of pci_enable_msi() and pci_disable_msi() is
deprecated.
This commit uses the preferred pair of API for the purpose. The call of
pci_alloc_irq_vectors() can have a subeffect to change the return value
of pci_dev_msi_enabled().
Link: https://lore.kernel.org/r/20240331135037.191479-4-o-takashi@sakamocchi.jp
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Diffstat (limited to 'drivers/firewire')
| -rw-r--r-- | drivers/firewire/ohci.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c index 0f55ef43292f..34262856f680 100644 --- a/drivers/firewire/ohci.c +++ b/drivers/firewire/ohci.c @@ -3631,7 +3631,7 @@ static int pci_probe(struct pci_dev *dev, struct fw_ohci *ohci; u32 bus_options, max_receive, link_speed, version; u64 guid; - int i, err; + int i, flags, err; size_t size; if (dev->vendor == PCI_VENDOR_ID_PINNACLE_SYSTEMS) { @@ -3756,8 +3756,13 @@ static int pci_probe(struct pci_dev *dev, guid = ((u64) reg_read(ohci, OHCI1394_GUIDHi) << 32) | reg_read(ohci, OHCI1394_GUIDLo); + flags = PCI_IRQ_INTX; if (!(ohci->quirks & QUIRK_NO_MSI)) - pci_enable_msi(dev); + flags |= PCI_IRQ_MSI; + err = pci_alloc_irq_vectors(dev, 1, 1, flags); + if (err < 0) + return err; + err = request_threaded_irq(dev->irq, irq_handler, NULL, pci_dev_msi_enabled(dev) ? 0 : IRQF_SHARED, ohci_driver_name, ohci); @@ -3784,7 +3789,7 @@ static int pci_probe(struct pci_dev *dev, fail_irq: free_irq(dev->irq, ohci); fail_msi: - pci_disable_msi(dev); + pci_free_irq_vectors(dev); return err; } @@ -3812,7 +3817,7 @@ static void pci_remove(struct pci_dev *dev) software_reset(ohci); free_irq(dev->irq, ohci); - pci_disable_msi(dev); + pci_free_irq_vectors(dev); dev_notice(&dev->dev, "removing fw-ohci device\n"); } |