niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

firewire: ohci: use devres for requested IRQ

Browse source 
The 1394 OHCI controller register handler to single interrupt number.

This commit uses managed device resource to maintain the lifetime of
requested IRQ.

Link: https://lore.kernel.org/r/20230604054451.161076-6-o-takashi@sakamocchi.jp
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
This commit is contained in:
Takashi Sakamoto 2023-06-04 14:44:47 +09:00
parent 8320442b26
commit 5a95f1ded2
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drivers/firewire/ohci.c
View file

@ -3697,17 +3697,16 @@ static int pci_probe(struct pci_dev *dev,
if (!(ohci->quirks & QUIRK_NO_MSI)) if (!(ohci->quirks & QUIRK_NO_MSI))
pci_enable_msi(dev); pci_enable_msi(dev);
if (request_irq(dev->irq, irq_handler, err = devm_request_irq(&dev->dev, dev->irq, irq_handler,
pci_dev_msi_enabled(dev) ? 0 : IRQF_SHARED, pci_dev_msi_enabled(dev) ? 0 : IRQF_SHARED, ohci_driver_name, ohci);
ohci_driver_name, ohci)) { if (err < 0) {
ohci_err(ohci, "failed to allocate interrupt %d\n", dev->irq); ohci_err(ohci, "failed to allocate interrupt %d\n", dev->irq);
err = -EIO;
goto fail_msi; goto fail_msi;
} }
err = fw_card_add(&ohci->card, max_receive, link_speed, guid); err = fw_card_add(&ohci->card, max_receive, link_speed, guid);
if (err) if (err)
goto fail_irq; goto fail_msi;
version = reg_read(ohci, OHCI1394_Version) & 0x00ff00ff; version = reg_read(ohci, OHCI1394_Version) & 0x00ff00ff;
ohci_notice(ohci, ohci_notice(ohci,
@ -3720,8 +3719,6 @@ static int pci_probe(struct pci_dev *dev,
return 0; return 0;
fail_irq:
free_irq(dev->irq, ohci);
fail_msi: fail_msi:
pci_disable_msi(dev); pci_disable_msi(dev);
fail_contexts: fail_contexts:
@ -3759,7 +3756,6 @@ static void pci_remove(struct pci_dev *dev)
*/ */
software_reset(ohci); software_reset(ohci);
free_irq(dev->irq, ohci);
if (ohci->next_config_rom && ohci->next_config_rom != ohci->config_rom) if (ohci->next_config_rom && ohci->next_config_rom != ohci->config_rom)
dma_free_coherent(ohci->card.device, CONFIG_ROM_SIZE, dma_free_coherent(ohci->card.device, CONFIG_ROM_SIZE,