Subject: [merged] input-remove-unnecessary-work-pending-test.patch removed from -mm tree
To: xiexiuqi@xxxxxxxxxx,dmitry.torokhov@xxxxxxxxx,fery@xxxxxxxxxxx,tj@xxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Fri, 22 Nov 2013 13:22:09 -0800
The patch titled
Subject: drivers/input/touchscreen/cyttsp4_core.c: : remove unnecessary work pending test
has been removed from the -mm tree. Its filename was
input-remove-unnecessary-work-pending-test.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Xie XiuQi <xiexiuqi@xxxxxxxxxx>
Subject: drivers/input/touchscreen/cyttsp4_core.c: : remove unnecessary work pending test
Remove unnecessary work pending test before calling schedule_work(). It
has been tested in queue_work_on() already.
Signed-off-by: Xie XiuQi <xiexiuqi@xxxxxxxxxx>
Reviewed-by: Tejun Heo <tj@xxxxxxxxxx>
Cc: Ferruh Yigit <fery@xxxxxxxxxxx>
Cc: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/input/touchscreen/cyttsp4_core.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff -puN drivers/input/touchscreen/cyttsp4_core.c~input-remove-unnecessary-work-pending-test drivers/input/touchscreen/cyttsp4_core.c
--- a/drivers/input/touchscreen/cyttsp4_core.c~input-remove-unnecessary-work-pending-test
+++ a/drivers/input/touchscreen/cyttsp4_core.c
@@ -1246,8 +1246,7 @@ static void cyttsp4_watchdog_timer(unsig
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;
}
_
Patches currently in -mm which might be from xiexiuqi@xxxxxxxxxx are
origin.patch
linux-next.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
