]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
drivers/input/touchscreen/cyttsp4_core.c: : remove unnecessary work pending test
authorXie XiuQi <xiexiuqi@huawei.com>
Tue, 5 Nov 2013 05:54:56 +0000 (16:54 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 5 Nov 2013 05:54:56 +0000 (16:54 +1100)
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>
Cc: Ferruh Yigit <fery@cypress.com>
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
drivers/input/touchscreen/cyttsp4_core.c

index d038575f49db3a6d70e16ee640fb67cfbcab24be..f8ed30f24c8cc205968535b604c4a435b6a94a0d 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;
 }