From: 黄涛 <huangtao@rock-chips.com>
Date: Mon, 16 Jun 2014 13:14:15 +0000 (+0800)
Subject: input: touchscreen: k29_i2c_goodix: fix compilation warning
X-Git-Tag: firefly_0821_release~5087
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f76a860c349cd08231375c5d971228306522e6a7;p=firefly-linux-kernel-4.4.55.git

input: touchscreen: k29_i2c_goodix: fix compilation warning
---

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;