From f76a860c349cd08231375c5d971228306522e6a7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E9=BB=84=E6=B6=9B?= Date: Mon, 16 Jun 2014 21:14:15 +0800 Subject: [PATCH] input: touchscreen: k29_i2c_goodix: fix compilation warning --- drivers/input/touchscreen/rk29_i2c_goodix.c | 6 ++++-- drivers/input/touchscreen/rk29_i2c_goodix.h | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/input/touchscreen/rk29_i2c_goodix.c b/drivers/input/touchscreen/rk29_i2c_goodix.c index d2e76f3ba7bf..4646e3cda5c1 100755 --- a/drivers/input/touchscreen/rk29_i2c_goodix.c +++ b/drivers/input/touchscreen/rk29_i2c_goodix.c @@ -519,18 +519,20 @@ static int rk_ts_resume(struct i2c_client *client) -static void rk_ts_early_suspend(struct tp_device *tp_d) +static int rk_ts_early_suspend(struct tp_device *tp_d) { struct rk_ts_data *ts; ts = container_of(tp_d, struct rk_ts_data, tp); rk_ts_suspend(ts->client, PMSG_SUSPEND); + return 0; } -static void rk_ts_early_resume(struct tp_device *tp_d) +static int rk_ts_early_resume(struct tp_device *tp_d) { struct rk_ts_data *ts; ts = container_of(tp_d, struct rk_ts_data, tp); rk_ts_resume(ts->client); + return 0; } diff --git a/drivers/input/touchscreen/rk29_i2c_goodix.h b/drivers/input/touchscreen/rk29_i2c_goodix.h index 31cc6c3d6563..1ea958868bbf 100755 --- a/drivers/input/touchscreen/rk29_i2c_goodix.h +++ b/drivers/input/touchscreen/rk29_i2c_goodix.h @@ -111,7 +111,9 @@ struct goodix_ts_data { static const char *rk_ts_name = "Goodix Capacitive TouchScreen"; struct i2c_client * i2c_connect_client = NULL; +#ifdef CONFIG_TOUCHSCREEN_GOODIX_IAP static struct proc_dir_entry *goodix_proc_entry; +#endif //static struct kobject *goodix_debug_kobj; -- 2.34.1