A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-13 16:16:15 -04:00
Code Issues Projects Releases Packages Wiki Activity

Revert "(CR): touchscreen_mmi: Do not write if value is same with cached"

Browse source 
CRs-fixed: (CR)

This reverts commit ae14e1e8e6b308b0d8e48310a3da5249a55e18ea.

Change-Id: If12f4a04f4a4467ac23c27e356163b647c7c37c0
Reviewed-on: https://gerrit.mot.com/1547048
Reviewed-by: Konstantin Makariev <kmakariev@motorola.com>
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Submit-Approved: Jira Key
This commit is contained in:
Jialei Hao 2020-05-04 07:48:21 -05:00 • committed by Jianqi Yang
commit 8340f806e9
1 changed files with 19 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

51
drivers/input/touchscreen/touchscreen_mmi/touchscreen_mmi_class.c
View file

@ -74,17 +74,18 @@ static ssize_t name##_store(struct device *dev, \
return -EINVAL; \
} \
mutex_lock(&touch_cdev->extif_mutex); \
if (touch_cdev->name != value) { \
mutex_lock(&touch_cdev->method_mutex); \
touch_cdev->name = value; \
if (!chk_tp_status || is_touch_active) { \
_TRY_TO_CALL(name, touch_cdev->name); \
if (ret < 0) \
dev_err(dev, "%s: return error %d\n", #name, ret); \
} else \
dev_dbg(dev, "%s: write to cache data.\n", #name); \
mutex_unlock(&touch_cdev->method_mutex); \
} \
mutex_lock(&touch_cdev->method_mutex); \
touch_cdev->name = value; \
if (!chk_tp_status || is_touch_active) { \
_TRY_TO_CALL(name, touch_cdev->name); \
if (ret < 0) { \
dev_err(dev, "%s: return error %d\n", #name, ret); \
goto TOUCH_MMI_STORE_OUT; \
} \
} else \
dev_dbg(dev, "%s: write to cache data.\n", #name); \
TOUCH_MMI_STORE_OUT: \
mutex_unlock(&touch_cdev->method_mutex); \
mutex_unlock(&touch_cdev->extif_mutex); \
return size; \
} \
@ -345,7 +346,6 @@ static ssize_t pill_region_store(struct device *dev,
unsigned int args[TS_MMI_PILL_REGION_REQ_ARGS_NUM] = {0};
int ret = 0;
int i = TS_MMI_PILL_REGION_REQ_ARGS_NUM;
bool need_update = false;
ret = sscanf(buf, "0x%x 0x%x 0x%x", &args[0], &args[1], &args[2]);
if (ret < TS_MMI_PILL_REGION_REQ_ARGS_NUM) {
@ -358,27 +358,14 @@ static ssize_t pill_region_store(struct device *dev,
return -EINVAL;
}
mutex_lock(&touch_cdev->extif_mutex);
mutex_lock(&touch_cdev->method_mutex);
while (i--)
if (touch_cdev->pill_region[i] != args[i]) {
need_update = true;
break;
}
if (need_update) {
mutex_lock(&touch_cdev->method_mutex);
i = TS_MMI_PILL_REGION_REQ_ARGS_NUM;
while (i--)
touch_cdev->pill_region[i] = args[i];
if (is_touch_active) {
_TRY_TO_CALL(pill_region, touch_cdev->pill_region);
if (ret < 0) {
dev_err(dev, "pill_region: return error %d\n", ret);
}
} else
dev_dbg(dev, "pill_region: write to cache data.\n");
mutex_unlock(&touch_cdev->method_mutex);
}
touch_cdev->pill_region[i] = args[i];
if (is_touch_active)
_TRY_TO_CALL(pill_region, touch_cdev->pill_region);
else
dev_dbg(dev, "pill_region: write to cache data.\n");
mutex_unlock(&touch_cdev->method_mutex);
mutex_unlock(&touch_cdev->extif_mutex);
return size;
}