From a1fa86582ae7c59019f3d4aead435214559d2c40 Mon Sep 17 00:00:00 2001 From: litong20 Date: Wed, 4 Mar 2020 20:03:23 -0600 Subject: [PATCH] Revert:(CR):timeout to wait for wake lock at suspend TP: The problem has been fixed in (CR). This reverts commit e54a92ed077617b745386cee07351c087aac3744. Change-Id: Iaddf7320f0c9477267c719adb6145e2491f30b2d Reviewed-on: https://gerrit.mot.com/1507347 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Jialei Hao Reviewed-by: Guobin Zhang Submit-Approved: Jira Key --- drivers/input/touchscreen/sec_mmi/sec_ts_mmi_class.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/drivers/input/touchscreen/sec_mmi/sec_ts_mmi_class.c b/drivers/input/touchscreen/sec_mmi/sec_ts_mmi_class.c index 49a1b356c55b..240db41eb399 100644 --- a/drivers/input/touchscreen/sec_mmi/sec_ts_mmi_class.c +++ b/drivers/input/touchscreen/sec_mmi/sec_ts_mmi_class.c @@ -42,8 +42,6 @@ } \ } -#define WAKELOCK_CHECKING_TIMEOUT_MS 300 - static ssize_t sec_mmi_suppression_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t size); static ssize_t sec_mmi_suppression_show(struct device *dev, @@ -768,7 +766,6 @@ static int sec_mmi_wait_for_ready(struct device *dev) { static int sec_mmi_pre_suspend(struct device *dev) { struct sec_ts_data *ts = dev_get_drvdata(dev); unsigned long start_wait_jiffies = jiffies; - unsigned int timeout = 0; if (!ts) { dev_err(dev, "Failed to get driver data"); @@ -778,11 +775,6 @@ static int sec_mmi_pre_suspend(struct device *dev) { do { if (!ts->wakelock.active) break; - if (++timeout > WAKELOCK_CHECKING_TIMEOUT_MS) { - dev_err(dev, "%s: %d ms timeout of checking wakelock\n", - __func__, WAKELOCK_CHECKING_TIMEOUT_MS); - return -ETIMEDOUT; - } usleep_range(1000, 1000); } while (1);