Merge "input: touchscreen: Remove improper debug code" (71b02bae) · Commits · e / devices / android_kernel_sony_msm8994

drivers/input/touchscreen/gt9xx/goodix_tool.c

+40 −54

Original line number	Diff line number	Diff line
		@@ -75,7 +75,7 @@ static void tool_set_proc_name(char *procname)
		int i = 0, n_month = 1, n_day = 0, n_year = 0;
		snprintf(date, 20, "%s", __DATE__);

		/* GTP_DEBUG("compile date: %s", date); */
		/* pr_debug("compile date: %s", date); */

		sscanf(date, "%s %d %d", month, &n_day, &n_year);

		@@ -87,7 +87,7 @@ static void tool_set_proc_name(char *procname)
		}

		snprintf(procname, 20, "gmnode%04d%02d%02d", n_year, n_month, n_day);
		/* GTP_DEBUG("procname = %s", procname); */
		/* pr_debug("procname = %s", procname); */
		}

		static s32 tool_i2c_read_no_extra(u8 *buf, u16 len)
		@@ -187,11 +187,11 @@ static void register_i2c_func(void)
		&& strncmp(IC_TYPE, "GTxxx", 5)) {
		tool_i2c_read = tool_i2c_read_with_extra;
		tool_i2c_write = tool_i2c_write_with_extra;
		GTP_DEBUG("I2C function: with pre and end cmd!");
		pr_debug("I2C function: with pre and end cmd!");
		} else {
		tool_i2c_read = tool_i2c_read_no_extra;
		tool_i2c_write = tool_i2c_write_no_extra;
		GTP_INFO("I2C function: without pre and end cmd!");
		pr_info("I2C function: without pre and end cmd!");
		}
		}

		@@ -199,7 +199,7 @@ static void unregister_i2c_func(void)
		{
		tool_i2c_read = NULL;
		tool_i2c_write = NULL;
		GTP_INFO("I2C function: unregister i2c transfer function!");
		pr_info("I2C function: unregister i2c transfer function!");
		}

		s32 init_wr_node(struct i2c_client *client)
		@@ -222,7 +222,7 @@ s32 init_wr_node(struct i2c_client *client)
		DATA_LENGTH = i * DATA_LENGTH_UINT;
		dev_dbg(&client->dev, "Applied memory size:%d.", DATA_LENGTH);
		} else {
		GTP_ERROR("Apply for memory failed.");
		pr_err("Apply for memory failed.");
		return FAIL;
		}

		@@ -235,10 +235,10 @@ s32 init_wr_node(struct i2c_client *client)
		tool_set_proc_name(procname);
		goodix_proc_entry = create_proc_entry(procname, 0660, NULL);
		if (goodix_proc_entry == NULL) {
		GTP_ERROR("Couldn't create proc entry!");
		pr_err("Couldn't create proc entry!");
		return FAIL;
		} else {
		GTP_INFO("Create proc entry success!");
		pr_info("Create proc entry success!");
		goodix_proc_entry->write_proc = goodix_tool_write;
		dix_proc_entry->read_proc = goodix_tool_read;
		}
		@@ -265,7 +265,7 @@ static u8 relation(u8 src, u8 dst, u8 rlt)

		case 1:
		ret = (src == dst) ? true : false;
		GTP_DEBUG("equal:src:0x%02x dst:0x%02x ret:%d.",
		pr_debug("equal:src:0x%02x dst:0x%02x ret:%d.",
		src, dst, (s32)ret);
		break;

		@@ -314,14 +314,14 @@ static u8 comfirm(void)

		for (i = 0; i < cmd_head.times; i++) {
		if (tool_i2c_read(buf, 1) <= 0) {
		GTP_ERROR("Read flag data failed!");
		pr_err("Read flag data failed!");
		return FAIL;
		}
		if (true == relation(buf[GTP_ADDR_LENGTH], cmd_head.flag_val,
		cmd_head.flag_relation)) {
		GTP_DEBUG("value at flag addr:0x%02x.",
		pr_debug("value at flag addr:0x%02x.",
		buf[GTP_ADDR_LENGTH]);
		GTP_DEBUG("flag value:0x%02x.", cmd_head.flag_val);
		pr_debug("flag value:0x%02x.", cmd_head.flag_val);
		break;
		}

		@@ -329,7 +329,7 @@ static u8 comfirm(void)
		}

		if (i >= cmd_head.times) {
		GTP_ERROR("Didn't get the flag to continue!");
		pr_err("Didn't get the flag to continue!");
		return FAIL;
		}

		@@ -348,32 +348,30 @@ static s32 goodix_tool_write(struct file filp, const char __user buff,
		unsigned long len, void *data)
		{
		s32 ret = 0;
		GTP_DEBUG_FUNC();
		GTP_DEBUG_ARRAY((u8 *)buff, len);

		mutex_lock(&lock);
		ret = copy_from_user(&cmd_head, buff, CMD_HEAD_LENGTH);
		if (ret) {
		GTP_ERROR("copy_from_user failed.");
		pr_err("copy_from_user failed.");
		ret = -EACCES;
		goto exit;
		}

		GTP_DEBUG("wr :0x%02x.", cmd_head.wr);
		GTP_DEBUG("flag:0x%02x.", cmd_head.flag);
		GTP_DEBUG("flag addr:0x%02x%02x.", cmd_head.flag_addr[0],
		pr_debug("wr :0x%02x.", cmd_head.wr);
		pr_debug("flag:0x%02x.", cmd_head.flag);
		pr_debug("flag addr:0x%02x%02x.", cmd_head.flag_addr[0],
		cmd_head.flag_addr[1]);
		GTP_DEBUG("flag val:0x%02x.", cmd_head.flag_val);
		GTP_DEBUG("flag rel:0x%02x.", cmd_head.flag_relation);
		GTP_DEBUG("circle :%d.", (s32)cmd_head.circle);
		GTP_DEBUG("times :%d.", (s32)cmd_head.times);
		GTP_DEBUG("retry :%d.", (s32)cmd_head.retry);
		GTP_DEBUG("delay :%d.", (s32)cmd_head.delay);
		GTP_DEBUG("data len:%d.", (s32)cmd_head.data_len);
		GTP_DEBUG("addr len:%d.", (s32)cmd_head.addr_len);
		GTP_DEBUG("addr:0x%02x%02x.", cmd_head.addr[0], cmd_head.addr[1]);
		GTP_DEBUG("len:%d.", (s32)len);
		GTP_DEBUG("buf[20]:0x%02x.", buff[CMD_HEAD_LENGTH]);
		pr_debug("flag val:0x%02x.", cmd_head.flag_val);
		pr_debug("flag rel:0x%02x.", cmd_head.flag_relation);
		pr_debug("circle :%d.", (s32)cmd_head.circle);
		pr_debug("times :%d.", (s32)cmd_head.times);
		pr_debug("retry :%d.", (s32)cmd_head.retry);
		pr_debug("delay :%d.", (s32)cmd_head.delay);
		pr_debug("data len:%d.", (s32)cmd_head.data_len);
		pr_debug("addr len:%d.", (s32)cmd_head.addr_len);
		pr_debug("addr:0x%02x%02x.", cmd_head.addr[0], cmd_head.addr[1]);
		pr_debug("len:%d.", (s32)len);
		pr_debug("buf[20]:0x%02x.", buff[CMD_HEAD_LENGTH]);

		if (cmd_head.data_len > (DATA_LENGTH - GTP_ADDR_LENGTH)) {
		pr_err("data len %d > data buff %d, rejected!\n",
		@@ -394,19 +392,14 @@ static s32 goodix_tool_write(struct file filp, const char __user buff,
		ret = copy_from_user(&cmd_head.data[GTP_ADDR_LENGTH],
		&buff[CMD_HEAD_LENGTH], cmd_head.data_len);
		if (ret)
		GTP_ERROR("copy_from_user failed.");
		pr_err("copy_from_user failed.");

		memcpy(&cmd_head.data[GTP_ADDR_LENGTH - cmd_head.addr_len],
		cmd_head.addr, cmd_head.addr_len);

		GTP_DEBUG_ARRAY(cmd_head.data,
		cmd_head.data_len + cmd_head.addr_len);
		GTP_DEBUG_ARRAY((u8 *)&buff[CMD_HEAD_LENGTH],
		cmd_head.data_len);

		if (cmd_head.flag == 1) {
		if (FAIL == comfirm()) {
		GTP_ERROR("[WRITE]Comfirm fail!");
		pr_err("[WRITE]Comfirm fail!");
		ret = -EINVAL;
		goto exit;
		}
		@@ -416,14 +409,11 @@ static s32 goodix_tool_write(struct file filp, const char __user buff,
		if (tool_i2c_write(
		&cmd_head.data[GTP_ADDR_LENGTH - cmd_head.addr_len],
		cmd_head.data_len + cmd_head.addr_len) <= 0) {
		GTP_ERROR("[WRITE]Write data failed!");
		pr_err("[WRITE]Write data failed!");
		ret = -EIO;
		goto exit;
		}

		GTP_DEBUG_ARRAY(
		&cmd_head.data[GTP_ADDR_LENGTH - cmd_head.addr_len],
		cmd_head.data_len + cmd_head.addr_len);
		if (cmd_head.delay)
		msleep(cmd_head.delay);

		@@ -434,7 +424,7 @@ static s32 goodix_tool_write(struct file filp, const char __user buff,
		ret = copy_from_user(&cmd_head.data[0], &buff[CMD_HEAD_LENGTH],
		cmd_head.data_len);
		if (ret)
		GTP_ERROR("copy_from_user failed.");
		pr_err("copy_from_user failed.");

		if (cmd_head.data_len > sizeof(IC_TYPE)) {
		pr_err("<<-GTP->> data len %d > data buff %d, rejected!\n",
		@@ -475,13 +465,13 @@ static s32 goodix_tool_write(struct file filp, const char __user buff,
		ret = copy_from_user(&cmd_head.data[GTP_ADDR_LENGTH],
		&buff[CMD_HEAD_LENGTH], cmd_head.data_len);
		if (ret)
		GTP_DEBUG("copy_from_user failed.");
		pr_debug("copy_from_user failed.");
		if (cmd_head.data[GTP_ADDR_LENGTH]) {
		GTP_DEBUG("gtp enter rawdiff.");
		pr_debug("gtp enter rawdiff.");
		ts->gtp_rawdiff_mode = true;
		} else {
		ts->gtp_rawdiff_mode = false;
		GTP_DEBUG("gtp leave rawdiff.");
		pr_debug("gtp leave rawdiff.");
		}
		ret = CMD_HEAD_LENGTH;
		goto exit;
		@@ -532,7 +522,6 @@ static s32 goodix_tool_read(char page, char *start, off_t off, int count,
		int eof, void data)
		{
		s32 ret;
		GTP_DEBUG_FUNC();

		mutex_lock(&lock);
		if (cmd_head.wr % 2) {
		@@ -546,7 +535,7 @@ static s32 goodix_tool_read(char page, char *start, off_t off, int count,

		if (cmd_head.flag == 1) {
		if (FAIL == comfirm()) {
		GTP_ERROR("[READ]Comfirm fail!");
		pr_err("[READ]Comfirm fail!");
		ret = -EINVAL;
		goto exit;
		}
		@@ -556,9 +545,9 @@ static s32 goodix_tool_read(char page, char *start, off_t off, int count,

		memcpy(cmd_head.data, cmd_head.addr, cmd_head.addr_len);

		GTP_DEBUG("[CMD HEAD DATA] ADDR:0x%02x%02x.", cmd_head.data[0],
		pr_debug("[CMD HEAD DATA] ADDR:0x%02x%02x.", cmd_head.data[0],
		cmd_head.data[1]);
		GTP_DEBUG("[CMD HEAD ADDR] ADDR:0x%02x%02x.", cmd_head.addr[0],
		pr_debug("[CMD HEAD ADDR] ADDR:0x%02x%02x.", cmd_head.addr[0],
		cmd_head.addr[1]);

		if (cmd_head.delay)
		@@ -574,23 +563,20 @@ static s32 goodix_tool_read(char page, char *start, off_t off, int count,
		data_len -= len;

		if (tool_i2c_read(cmd_head.data, len) <= 0) {
		GTP_ERROR("[READ]Read data failed!");
		pr_err("[READ]Read data failed!");
		ret = -EINVAL;
		goto exit;
		}
		memcpy(&page[loc], &cmd_head.data[GTP_ADDR_LENGTH],
		len);
		loc += len;

		GTP_DEBUG_ARRAY(&cmd_head.data[GTP_ADDR_LENGTH], len);
		GTP_DEBUG_ARRAY(page, len);
		}
		} else if (cmd_head.wr == 2) {
		/* memcpy(page, "gt8", cmd_head.data_len);
		memcpy(page, "GT818", 5);
		page[5] = 0; */

		GTP_DEBUG("Return ic type:%s len:%d.", page,
		pr_debug("Return ic type:%s len:%d.", page,
		(s32)cmd_head.data_len);
		ret = cmd_head.data_len;
		goto exit;

drivers/input/touchscreen/gt9xx/gt9xx.c

+0 −21

Original line number	Diff line number	Diff line
		@@ -82,14 +82,6 @@
		static const u16 touch_key_array[] = {KEY_MENU, KEY_HOMEPAGE, KEY_BACK};
		#define GTP_MAX_KEY_NUM (sizeof(touch_key_array)/sizeof(touch_key_array[0]))

		#if GTP_DEBUG_ON
		static const int key_codes[] = {
		KEY_HOME, KEY_BACK, KEY_MENU, KEY_SEARCH
		};
		static const char *const key_names[] = {
		"Key_Home", "Key_Back", "Key_Menu", "Key_Search"
		};
		#endif
		#endif

		static void gtp_reset_guitar(struct goodix_ts_data *ts, int ms);
		@@ -505,19 +497,6 @@ static void goodix_ts_work_func(struct work_struct *work)

		if (key_value \|\| pre_key) {
		for (i = 0; i < GTP_MAX_KEY_NUM; i++) {

		#if GTP_DEBUG_ON
		for (ret = 0; ret < 4; ++ret) {
		if (key_codes[ret] == touch_key_array[i]) {
		GTP_DEBUG("Key: %s %s",
		key_names[ret],
		(key_value & (0x01 << i))
		? "Down" : "Up");
		break;
		}
		}
		#endif

		input_report_key(ts->input_dev,
		touch_key_array[i], key_value & (0x01<<i));
		}

drivers/input/touchscreen/gt9xx/gt9xx.h

+0 −37

Original line number	Diff line number	Diff line
		@@ -123,10 +123,6 @@ extern u16 total_len;
		/* double-click wakeup, function together with GTP_SLIDE_WAKEUP */
		#define GTP_DBL_CLK_WAKEUP 0

		#define GTP_DEBUG_ON 0
		#define GTP_DEBUG_ARRAY_ON 0
		#define GTP_DEBUG_FUNC_ON 0

		/************************* PART2:TODO define *****************************/
		/* STEP_1(REQUIRED): Define Configuration Information Group(s) */
		/* Sensor_ID Map: */
		@@ -193,39 +189,6 @@ extern u16 total_len;
		#define TRIGGER_LOC 8

		#define CFG_GROUP_LEN(p_cfg_grp) (sizeof(p_cfg_grp) / sizeof(p_cfg_grp[0]))
		/* Log define */
		#define GTP_DEBUG(fmt, arg...) do {\
		if (GTP_DEBUG_ON) {\
		pr_debug("<<-GTP-DEBUG->> [%d]"fmt"\n",\
		__LINE__, ##arg); } \
		} while (0)

		#define GTP_DEBUG_ARRAY(array, num) do {\
		s32 i; \
		u8 *a = array; \
		if (GTP_DEBUG_ARRAY_ON) {\
		pr_debug("<<-GTP-DEBUG-ARRAY->>\n");\
		for (i = 0; i < (num); i++) { \
		pr_debug("%02x ", (a)[i]);\
		if ((i + 1) % 10 == 0) { \
		pr_debug("\n");\
		} \
		} \
		pr_debug("\n");\
		} \
		} while (0)

		#define GTP_DEBUG_FUNC() do {\
		if (GTP_DEBUG_FUNC_ON)\
		pr_debug("<<-GTP-FUNC->> Func:%s@Line:%d\n",\
		__func__, __LINE__);\
		} while (0)

		#define GTP_SWAP(x, y) do {\
		typeof(x) z = x;\
		x = y;\
		y = z;\
		} while (0)
		/***************************End of Part III******************************/

		void gtp_esd_switch(struct i2c_client *client, int on);

drivers/input/touchscreen/gt9xx/gt9xx_update.c

+221 −253

File changed.

Preview size limit exceeded, changes collapsed.