From df44ef203c1f157fa4a9a492b6148fad5b47876c Mon Sep 17 00:00:00 2001 From: dianlujitao Date: Tue, 1 Feb 2022 13:54:41 +0800 Subject: [PATCH] input: touchscreen: nova_0flash_mmi: Remove unused screen_state and mutex Change-Id: Ibb245928e04bdbdc71a6fbaad8e67da3405648b8 --- .../touchscreen/nova_0flash_mmi/nt36xxx.c | 30 ------------------- .../touchscreen/nova_0flash_mmi/nt36xxx.h | 8 ----- 2 files changed, 38 deletions(-) diff --git a/drivers/input/touchscreen/nova_0flash_mmi/nt36xxx.c b/drivers/input/touchscreen/nova_0flash_mmi/nt36xxx.c index 9e5271d949f4..fd401a28cffb 100644 --- a/drivers/input/touchscreen/nova_0flash_mmi/nt36xxx.c +++ b/drivers/input/touchscreen/nova_0flash_mmi/nt36xxx.c @@ -2219,7 +2219,6 @@ static int nvt_sensor_set_enable(struct sensors_classdev *sensors_cdev, NVT_LOG("wakeup gesture ctrl, do nothing"); #else NVT_LOG("Gesture set enable %d!", enable); - mutex_lock(&ts->state_mutex); if (enable == 1) { ts->should_enable_gesture = true; } else if (enable == 0) { @@ -2227,7 +2226,6 @@ static int nvt_sensor_set_enable(struct sensors_classdev *sensors_cdev, } else { NVT_LOG("unknown enable symbol\n"); } - mutex_unlock(&ts->state_mutex); #endif return 0; } @@ -3104,12 +3102,6 @@ static int32_t nvt_ts_probe(struct spi_device *client) mutex_init(&ts->lock); mutex_init(&ts->xbuf_lock); -#ifdef NVT_SENSOR_EN - mutex_init(&ts->state_mutex); - //unknown screen state - ts->screen_state = SCREEN_UNKNOWN; -#endif - //---eng reset before TP_RESX high nvt_eng_reset(); @@ -3838,14 +3830,7 @@ int32_t nvt_ts_suspend(struct device *dev) { uint8_t buf[4] = {0}; -#ifdef NVT_SENSOR_EN - mutex_lock(&ts->state_mutex); -#endif - if (!ts->bTouchIsAwake) { -#ifdef NVT_SENSOR_EN - mutex_unlock(&ts->state_mutex); -#endif NVT_LOG("Touch is already suspend\n"); return 0; } @@ -3918,10 +3903,6 @@ int32_t nvt_ts_suspend(struct device *dev) msleep(50); NVT_LOG("end\n"); -#ifdef NVT_SENSOR_EN - ts->screen_state = SCREEN_OFF; - mutex_unlock(&ts->state_mutex); -#endif return 0; } @@ -3935,14 +3916,7 @@ return: *******************************************************/ int32_t nvt_ts_resume(struct device *dev) { - -#ifdef NVT_SENSOR_EN - mutex_lock(&ts->state_mutex); -#endif if (ts->bTouchIsAwake) { -#ifdef NVT_SENSOR_EN - mutex_unlock(&ts->state_mutex); -#endif NVT_LOG("Touch is already resume\n"); return 0; } @@ -4019,10 +3993,6 @@ int32_t nvt_ts_resume(struct device *dev) NVT_LOG("end\n"); -#ifdef NVT_SENSOR_EN - ts->screen_state = SCREEN_ON; - mutex_unlock(&ts->state_mutex); -#endif return 0; } diff --git a/drivers/input/touchscreen/nova_0flash_mmi/nt36xxx.h b/drivers/input/touchscreen/nova_0flash_mmi/nt36xxx.h index f1591c1ddab8..aaa683809596 100644 --- a/drivers/input/touchscreen/nova_0flash_mmi/nt36xxx.h +++ b/drivers/input/touchscreen/nova_0flash_mmi/nt36xxx.h @@ -163,12 +163,6 @@ extern struct delayed_work nvt_esd_check_work; #endif #ifdef NVT_SENSOR_EN -/* display state */ -enum display_state { - SCREEN_UNKNOWN, - SCREEN_OFF, - SCREEN_ON, -}; struct nvt_sensor_platform_data { struct input_dev *input_sensor_dev; struct sensors_classdev ps_cdev; @@ -251,8 +245,6 @@ struct nvt_ts_data { #endif #ifdef NVT_SENSOR_EN bool should_enable_gesture; - enum display_state screen_state; - struct mutex state_mutex; struct nvt_sensor_platform_data *sensor_pdata; #endif #ifdef PALM_GESTURE