From c1f6eacfa9428e07b9d72b41be33168a5cb4ccdc Mon Sep 17 00:00:00 2001 From: litong Date: Mon, 22 Nov 2021 20:17:49 -0600 Subject: [PATCH] Revert "(CR): Add pm_qos control to reduce the interrupt responce time" This reverts commit 1da6346249088c0e5d42c6147b2c5bcd8ec9e395. CRs-fixed: (CR) Change-Id: I1fd4e6f2c5144433728aa021391aab385d1db4bf Reviewed-on: https://gerrit.mot.com/2124282 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Jichao Zou Submit-Approved: Jira Key --- .../touchscreen/goodix_berlin_mmi/goodix_ts_core.c | 14 -------------- .../touchscreen/goodix_berlin_mmi/goodix_ts_core.h | 3 --- 2 files changed, 17 deletions(-) diff --git a/drivers/input/touchscreen/goodix_berlin_mmi/goodix_ts_core.c b/drivers/input/touchscreen/goodix_berlin_mmi/goodix_ts_core.c index 92516e2c10a7..b131ccb5d4ae 100644 --- a/drivers/input/touchscreen/goodix_berlin_mmi/goodix_ts_core.c +++ b/drivers/input/touchscreen/goodix_berlin_mmi/goodix_ts_core.c @@ -1097,11 +1097,6 @@ static int goodix_parse_dt(struct device_node *node, } } - board_data->pm_qos_enable = of_property_read_bool(node, - "goodix,pm_qos-enable"); - if (board_data->pm_qos_enable) - ts_info("goodix pm_qos enabled"); - board_data->sensitivity_ctrl = of_property_read_bool(node, "goodix,sensitivity-ctrl"); if (board_data->sensitivity_ctrl) @@ -1232,13 +1227,8 @@ static irqreturn_t goodix_ts_threadirq_func(int irq, void *data) struct goodix_ext_module *ext_module, *next; struct goodix_ts_event *ts_event = &core_data->ts_event; struct goodix_ts_esd *ts_esd = &core_data->ts_esd; - const struct goodix_ts_board_data *ts_bdata = board_data(core_data); int ret; - if (ts_bdata->pm_qos_enable) - cpu_latency_qos_add_request(&core_data->goodix_pm_qos, 0); - - ts_esd->irq_status = true; core_data->irq_trig_cnt++; /* inform external module */ @@ -1277,10 +1267,6 @@ static irqreturn_t goodix_ts_threadirq_func(int irq, void *data) hw_ops->after_event_handler(core_data); ts_event->retry = 0; - if (ts_bdata->pm_qos_enable) - cpu_latency_qos_remove_request(&core_data->goodix_pm_qos); - - return IRQ_HANDLED; } diff --git a/drivers/input/touchscreen/goodix_berlin_mmi/goodix_ts_core.h b/drivers/input/touchscreen/goodix_berlin_mmi/goodix_ts_core.h index c2ffb36278d1..5db68daba2ed 100644 --- a/drivers/input/touchscreen/goodix_berlin_mmi/goodix_ts_core.h +++ b/drivers/input/touchscreen/goodix_berlin_mmi/goodix_ts_core.h @@ -16,7 +16,6 @@ #include #include #include -#include #ifdef CONFIG_OF #include #include @@ -273,7 +272,6 @@ struct goodix_ts_board_data { unsigned int panel_max_p; /*pressure*/ bool pen_enable; - bool pm_qos_enable; char fw_name[GOODIX_MAX_STR_LABLE_LEN]; char cfg_bin_name[GOODIX_MAX_STR_LABLE_LEN]; char stylus_clk_src[GOODIX_MAX_STR_LABLE_LEN]; /*stylus clock source*/ @@ -491,7 +489,6 @@ struct goodix_ts_core { struct wakeup_source *gesture_wakelock; struct notifier_block ts_notifier; struct goodix_ts_esd ts_esd; - struct pm_qos_request goodix_pm_qos; #ifdef CONFIG_FB struct notifier_block fb_notifier;