There's no need to test whether a (delayed) work item in pending before queueing, flushing or cancelling it. Most uses are unnecessary and quite a few of them are buggy.
Remove unnecessary pending tests from wm97xx. Instead of testing work_pending(), use the return value of queue_work() to decide whether to disable IRQ or not. Only compile tested. Signed-off-by: Tejun Heo <[email protected]> Cc: Mark Brown <[email protected]> Cc: Liam Girdwood <[email protected]> Cc: [email protected] Cc: Dmitry Torokhov <[email protected]> --- Please let me know how this patch should be routed. I can take it through the workqueue tree if necessary. Thanks. drivers/input/touchscreen/wm97xx-core.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/input/touchscreen/wm97xx-core.c b/drivers/input/touchscreen/wm97xx-core.c index 5dbe73a..fd16c63 100644 --- a/drivers/input/touchscreen/wm97xx-core.c +++ b/drivers/input/touchscreen/wm97xx-core.c @@ -363,10 +363,8 @@ static irqreturn_t wm97xx_pen_interrupt(int irq, void *dev_id) { struct wm97xx *wm = dev_id; - if (!work_pending(&wm->pen_event_work)) { + if (queue_work(wm->ts_workq, &wm->pen_event_work)) wm->mach_ops->irq_enable(wm, 0); - queue_work(wm->ts_workq, &wm->pen_event_work); - } return IRQ_HANDLED; } -- 1.8.0.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
