Skip to content

Commit 5a95f1d

Browse files
committed
firewire: ohci: use devres for requested IRQ
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>
1 parent 8320442 commit 5a95f1d

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

drivers/firewire/ohci.c

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3697,17 +3697,16 @@ static int pci_probe(struct pci_dev *dev,
36973697

36983698
if (!(ohci->quirks & QUIRK_NO_MSI))
36993699
pci_enable_msi(dev);
3700-
if (request_irq(dev->irq, irq_handler,
3701-
pci_dev_msi_enabled(dev) ? 0 : IRQF_SHARED,
3702-
ohci_driver_name, ohci)) {
3700+
err = devm_request_irq(&dev->dev, dev->irq, irq_handler,
3701+
pci_dev_msi_enabled(dev) ? 0 : IRQF_SHARED, ohci_driver_name, ohci);
3702+
if (err < 0) {
37033703
ohci_err(ohci, "failed to allocate interrupt %d\n", dev->irq);
3704-
err = -EIO;
37053704
goto fail_msi;
37063705
}
37073706

37083707
err = fw_card_add(&ohci->card, max_receive, link_speed, guid);
37093708
if (err)
3710-
goto fail_irq;
3709+
goto fail_msi;
37113710

37123711
version = reg_read(ohci, OHCI1394_Version) & 0x00ff00ff;
37133712
ohci_notice(ohci,
@@ -3720,8 +3719,6 @@ static int pci_probe(struct pci_dev *dev,
37203719

37213720
return 0;
37223721

3723-
fail_irq:
3724-
free_irq(dev->irq, ohci);
37253722
fail_msi:
37263723
pci_disable_msi(dev);
37273724
fail_contexts:
@@ -3759,7 +3756,6 @@ static void pci_remove(struct pci_dev *dev)
37593756
*/
37603757

37613758
software_reset(ohci);
3762-
free_irq(dev->irq, ohci);
37633759

37643760
if (ohci->next_config_rom && ohci->next_config_rom != ohci->config_rom)
37653761
dma_free_coherent(ohci->card.device, CONFIG_ROM_SIZE,

0 commit comments

Comments
 (0)