lkml.org 
[lkml]   [2015]   [Sep]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] serial: sccnxp: convert devm irq to non devm version
Date
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.Lawall@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);



\
 
 \ /
  Last update: 2015-09-13 16:21    [W:0.111 / U:0.236 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site