There seems to be no need to request an irq with a devm function, since the
irq is being freed explicitly.

Signed-off-by: Julia Lawall <julia.law...@lip6.fr>

---

Compile tested only.

 drivers/tty/serial/sccnxp.c |   10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/drivers/tty/serial/sccnxp.c b/drivers/tty/serial/sccnxp.c
index fcf803f..d0d5fa9 100644
--- a/drivers/tty/serial/sccnxp.c
+++ b/drivers/tty/serial/sccnxp.c
@@ -963,11 +963,9 @@ static int sccnxp_probe(struct platform_device *pdev)
        sccnxp_write(&s->port[0], SCCNXP_IMR_REG, 0);
 
        if (!s->poll) {
-               ret = devm_request_threaded_irq(&pdev->dev, s->irq, NULL,
-                                               sccnxp_ist,
-                                               IRQF_TRIGGER_FALLING |
-                                               IRQF_ONESHOT,
-                                               dev_name(&pdev->dev), s);
+               ret = request_threaded_irq(s->irq, NULL, sccnxp_ist,
+                                          IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
+                                          dev_name(&pdev->dev), s);
                if (!ret)
                        return 0;
 
@@ -994,7 +992,7 @@ static int sccnxp_remove(struct platform_device *pdev)
        struct sccnxp_port *s = platform_get_drvdata(pdev);
 
        if (!s->poll)
-               devm_free_irq(&pdev->dev, s->irq, s);
+               free_irq(s->irq, s);
        else
                del_timer_sync(&s->timer);
 

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to