From 543fe899acbe59beb03332adb7874946dfab4c38 Mon Sep 17 00:00:00 2001
From: WANG XING <Raymond.Wangxing@huawei.com>
Date: Tue, 28 Jul 2015 23:01:19 +0800
Subject: [PATCH] input: touchscreen: delete useless config and log
It is not necessary to config virtual keys when re-initialize
the input device for watch.These config could lead to unexpected
error,like "VirtualKey xxx: could not obtain key code, ignoring".
Delete the config of virtual keys in synaptics-dsx.dtsi.
Also delete the useless log in synaptics_rmi4_suspend.
Change-Id: I4827418232049bc063d0f2b287039f52a8e1cfb6
Signed-off-by: l00212897 <gang.li@huawei.com>
---
arch/arm/boot/dts/apq8026-sturgeon/synaptics-dsx.dtsi | 1 -
drivers/input/touchscreen/synaptics_dsx/synaptics_dsx_core.c | 3 ---
2 files changed, 4 deletions(-)
diff --git a/arch/arm/boot/dts/apq8026-sturgeon/synaptics-dsx.dtsi b/arch/arm/boot/dts/apq8026-sturgeon/synaptics-dsx.dtsi
index bee3de71fe8b..1971473cf48d 100644
--- a/arch/arm/boot/dts/apq8026-sturgeon/synaptics-dsx.dtsi
+++ b/arch/arm/boot/dts/apq8026-sturgeon/synaptics-dsx.dtsi
@@ -34,7 +34,6 @@
synaptics,reset-active-ms = <10>;
synaptics,reset-delay-ms = <150>;
//synaptics,max-y-for-2d = <800>; /* remove if no virtual buttons */
- synaptics,vir-button-codes = <102 100 900 100 60 158 300 900 100 60>;
};
};
};
diff --git a/drivers/input/touchscreen/synaptics_dsx/synaptics_dsx_core.c b/drivers/input/touchscreen/synaptics_dsx/synaptics_dsx_core.c
index 00ad6db120b9..ab15ca959786 100644
--- a/drivers/input/touchscreen/synaptics_dsx/synaptics_dsx_core.c
+++ b/drivers/input/touchscreen/synaptics_dsx/synaptics_dsx_core.c
@@ -3839,10 +3839,7 @@ static int synaptics_rmi4_suspend(struct device *dev)
if (rmi4_data->stay_awake)
return 0;
if (rmi4_data->suspend)
- {
- pr_info("%s:already in suspend\n", __func__);
return 0;
- }
if (rmi4_data->palm_down) {
rmi4_data->palm_down = false;
--
GitLab