[PATCH] tty: serial: sc16is7xx: use threaded interrupts instead of homegrow
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Date: 2016-02-26 11:48:09
Also in:
linux-serial
Subsystem:
the rest, tty layer and serial drivers · Maintainers:
Linus Torvalds, Greg Kroah-Hartman, Jiri Slaby
Possibly related (same subject, not in this thread)
- 2016-03-09 · Re: [PATCH] tty: serial: sc16is7xx: use threaded interrupts instead of homegrow · Maarten Brock <hidden>
This ONESHOT + workqueue combo is something that is not required because we have infrastrucure for this kind of things: threaded interrupts. This is compile tested only due to -ENODEV. Now that we that sc16is7xx_irq() is an actual interrupt handler sc16is7xx_port_irq() could be improved so the former can return IRQ_NONE if nothing has been done. Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> --- drivers/tty/serial/sc16is7xx.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-)
diff --git a/drivers/tty/serial/sc16is7xx.c b/drivers/tty/serial/sc16is7xx.c
index edb5305b9d4d..b53a13be5754 100644
--- a/drivers/tty/serial/sc16is7xx.c
+++ b/drivers/tty/serial/sc16is7xx.c@@ -331,7 +331,6 @@ struct sc16is7xx_port { unsigned char buf[SC16IS7XX_FIFO_SIZE]; struct kthread_worker kworker; struct task_struct *kworker_task; - struct kthread_work irq_work; struct sc16is7xx_one p[0]; };
@@ -688,20 +687,13 @@ static void sc16is7xx_port_irq(struct sc16is7xx_port *s, int portno) } while (1); } -static void sc16is7xx_ist(struct kthread_work *ws) +static irqreturn_t sc16is7xx_irq(int irq, void *dev_id) { - struct sc16is7xx_port *s = to_sc16is7xx_port(ws, irq_work); + struct sc16is7xx_port *s = (struct sc16is7xx_port *)dev_id; int i; for (i = 0; i < s->devtype->nr_uart; ++i) sc16is7xx_port_irq(s, i); -} - -static irqreturn_t sc16is7xx_irq(int irq, void *dev_id) -{ - struct sc16is7xx_port *s = (struct sc16is7xx_port *)dev_id; - - queue_kthread_work(&s->kworker, &s->irq_work); return IRQ_HANDLED; }
@@ -1167,7 +1159,6 @@ static int sc16is7xx_probe(struct device *dev, dev_set_drvdata(dev, s); init_kthread_worker(&s->kworker); - init_kthread_work(&s->irq_work, sc16is7xx_ist); s->kworker_task = kthread_run(kthread_worker_fn, &s->kworker, "sc16is7xx"); if (IS_ERR(s->kworker_task)) {
@@ -1229,8 +1220,8 @@ static int sc16is7xx_probe(struct device *dev, } /* Setup interrupt */ - ret = devm_request_irq(dev, irq, sc16is7xx_irq, - IRQF_ONESHOT | flags, dev_name(dev), s); + ret = devm_request_threaded_irq(dev, irq, NULL, sc16is7xx_irq, + flags, dev_name(dev), s); if (!ret) return 0;
--
2.7.0