diff options
| author | Yen-Chao Chen <davidycchen@google.com> | 2022-11-24 09:23:08 +0000 |
|---|---|---|
| committer | Android Partner Code Review <android-gerrit-partner@google.com> | 2022-11-24 09:23:08 +0000 |
| commit | c9caff69d8254154342af935eca1501af123f53c (patch) | |
| tree | fd90e87ef4b561a7ca27f62ab23814d6cecdbef0 | |
| parent | c44cc021f0c782639a2e3e223ba087941460d408 (diff) | |
| parent | 24e7d24d10eafe09cafc739b6aa8b2020c169dd3 (diff) | |
| download | goodix_touch-c9caff69d8254154342af935eca1501af123f53c.tar.gz | |
Merge "goodix: move finger releasing process to GTI." into android13-gs-pixel-5.10-tm-qpr2
| -rw-r--r-- | goodix_ts_core.c | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/goodix_ts_core.c b/goodix_ts_core.c index b7f80fd..323b32d 100644 --- a/goodix_ts_core.c +++ b/goodix_ts_core.c @@ -2328,28 +2328,6 @@ static void goodix_ts_release_connects(struct goodix_ts_core *core_data) } #endif -#if IS_ENABLED(CONFIG_GOOG_TOUCH_INTERFACE) -static void goodix_ts_release_connects_goog(struct goodix_ts_core *core_data) -{ - struct input_dev *input_dev = core_data->input_dev; - struct goog_touch_interface *gti = core_data->gti; - int i; - - goog_input_lock(gti); - - goog_input_set_timestamp(gti, input_dev, KTIME_RELEASE_ALL); - for (i = 0; i < GOODIX_MAX_TOUCH; i++) { - goog_input_mt_slot(gti, input_dev, i); - goog_input_mt_report_slot_state( - gti, input_dev, MT_TOOL_FINGER, false); - } - goog_input_report_key(gti, input_dev, BTN_TOUCH, 0); - goog_input_sync(gti, input_dev); - - goog_input_unlock(gti); -} -#endif - /** * goodix_ts_suspend - Touchscreen suspend function * Called by PM/FB/EARLYSUSPEN module to put the device to sleep @@ -2426,9 +2404,7 @@ static int goodix_ts_suspend(struct goodix_ts_core *core_data) goodix_set_pinctrl_state(core_data, PINCTRL_MODE_SUSPEND); out: -#if IS_ENABLED(CONFIG_GOOG_TOUCH_INTERFACE) - goodix_ts_release_connects_goog(core_data); -#else +#if !IS_ENABLED(CONFIG_GOOG_TOUCH_INTERFACE) goodix_ts_release_connects(core_data); #endif |