From e7a8ed88d36779a87517c39144a54d0cd7c36dd3 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 13 Jan 2012 18:56:03 +0800 Subject: [PATCH] touch screen:clean gt818_ts.c compile warning --- drivers/input/touchscreen/gt818_ts.c | 12 ++++-------- drivers/input/touchscreen/gt818_ts.h | 6 ++---- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/drivers/input/touchscreen/gt818_ts.c b/drivers/input/touchscreen/gt818_ts.c index 8dd6b5d20f94..857607e8c182 100644 --- a/drivers/input/touchscreen/gt818_ts.c +++ b/drivers/input/touchscreen/gt818_ts.c @@ -54,14 +54,12 @@ static struct workqueue_struct *goodix_wq; static const char *gt818_ts_name = "Goodix Capacitive TouchScreen"; -static struct point_queue finger_list; +//static struct point_queue finger_list; struct i2c_client * i2c_connect_client = NULL; //EXPORT_SYMBOL(i2c_connect_client); -static struct proc_dir_entry *goodix_proc_entry; - #ifdef CONFIG_HAS_EARLYSUSPEND static void goodix_ts_early_suspend(struct early_suspend *h); static void goodix_ts_late_resume(struct early_suspend *h); @@ -235,7 +233,6 @@ static void goodix_ts_work_func(struct work_struct *work) u8 finger = 0; u8 key = 0; - u8 retry = 0; unsigned int count = 0; unsigned int position = 0; int temp = 0; @@ -407,7 +404,7 @@ XFER_ERROR: enable_irq(ts->client->irq); } - +#if 0 static int test_suspend_resume(struct gt818_ts_data *ts){ while(1){ ts->power(ts, 0); @@ -417,7 +414,7 @@ static int test_suspend_resume(struct gt818_ts_data *ts){ } return 0; } - +#endif static enum hrtimer_restart goodix_ts_timer_func(struct hrtimer *timer) { @@ -502,7 +499,6 @@ static int goodix_ts_probe(struct i2c_client *client, const struct i2c_device_id { int ret = 0; int retry=0; - u8 goodix_id[3] = {0,0xff,0}; struct gt818_ts_data *ts; struct gt818_platform_data *pdata; @@ -564,6 +560,7 @@ static int goodix_ts_probe(struct i2c_client *client, const struct i2c_device_id dev_err(&client->dev, "Warnning: I2C communication might be ERROR!\n"); goto err_i2c_failed; } + #endif for(retry = 0; retry < 3; retry++) @@ -718,7 +715,6 @@ err_i2c_failed: kfree(ts); err_alloc_data_failed: err_check_functionality_failed: -err_create_proc_entry: return ret; } diff --git a/drivers/input/touchscreen/gt818_ts.h b/drivers/input/touchscreen/gt818_ts.h index e969bc4ad08b..ecdc4a0612be 100644 --- a/drivers/input/touchscreen/gt818_ts.h +++ b/drivers/input/touchscreen/gt818_ts.h @@ -41,7 +41,7 @@ -#define SHUTDOWN_PORT pdata->gpio_reset //SHUTDOWN¹Ü½ÅºÅ +#define SHUTDOWN_PORT pdata->gpio_reset //SHUTDOWN�ܽź� #define INT_PORT pdata->gpio_pendown #ifdef INT_PORT @@ -55,7 +55,7 @@ #define FLAG_UP 0 #define FLAG_DOWN 1 -//set GT801 PLUS trigger mode,Ö»ÄÜÉèÖÃ0»ò1 +//set GT801 PLUS trigger mode,ֻ������0��1 #define INT_TRIGGER 1 #define POLL_TIME 10 //actual query spacing interval:POLL_TIME+6 @@ -66,8 +66,6 @@ #define MAX_FINGER_NUM 1 #endif -#define swap(x, y) do { typeof(x) z = x; x = y; y = z; } while (0) - #define READ_TOUCH_ADDR_H 0x07 #define READ_TOUCH_ADDR_L 0x12 #define READ_KEY_ADDR_H 0x07 -- 2.34.1