media: solo6x10: Use devm functions

Let devm handle the life cycle of the irq request.

Makes smatch happier:

drivers/media/pci/solo6x10/solo6x10-core.c:631 solo_pci_probe() warn: 'pdev' from pci_request_regions() not released on lines: 631.

Signed-off-by: Ricardo Ribalda <ribalda@chromium.org>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>

diff --git a/drivers/media/pci/solo6x10/solo6x10-core.c b/drivers/media/pci/solo6x10/solo6x10-core.c
index abf30b7609e1758af2a2142ea3a776ab13256128..1a9e2bccc4136abce16415b00279434e12b383d9 100644 (file)
--- a/drivers/media/pci/solo6x10/solo6x10-core.c
+++ b/drivers/media/pci/solo6x10/solo6x10-core.c
@@ -144,7 +144,6 @@ static void free_solo_dev(struct solo_dev *solo_dev)
 
                /* Now cleanup the PCI device */
                solo_irq_off(solo_dev, ~0);
-               free_irq(pdev->irq, solo_dev);
        }
 
        pci_disable_device(pdev);
@@ -544,8 +543,8 @@ static int solo_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
        /* PLL locking time of 1ms */
        mdelay(1);
 
-       ret = request_irq(pdev->irq, solo_isr, IRQF_SHARED, SOLO6X10_NAME,
-                         solo_dev);
+       ret = devm_request_irq(&pdev->dev, pdev->irq, solo_isr, IRQF_SHARED,
+                              SOLO6X10_NAME, solo_dev);
        if (ret)
                goto fail_probe;