]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
Input: cyttsp4 - remove unnecessary work pending test
authorXie XiuQi <xiexiuqi@huawei.com>
Tue, 19 Nov 2013 21:15:43 +0000 (13:15 -0800)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Thu, 21 Nov 2013 05:15:26 +0000 (21:15 -0800)
Remove unnecessary work pending test before calling schedule_work().  It
has been tested in queue_work_on() already.

Signed-off-by: Xie XiuQi <xiexiuqi@huawei.com>
Reviewed-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
drivers/input/touchscreen/cyttsp4_core.c

index 42d830efa316ec9c44f53306123e0ffb2a2d04b5..a035a390f8e29f4caa36e4949fd54d469e9cdc24 100644 (file)
@@ -1246,8 +1246,7 @@ static void cyttsp4_watchdog_timer(unsigned long handle)
 
        dev_vdbg(cd->dev, "%s: Watchdog timer triggered\n", __func__);
 
-       if (!work_pending(&cd->watchdog_work))
-               schedule_work(&cd->watchdog_work);
+       schedule_work(&cd->watchdog_work);
 
        return;
 }