From de4584117fa2c6b239849365d5c01e8add54529f Mon Sep 17 00:00:00 2001
From: litong20 <litong20@lenovo.com>
Date: Sat, 14 May 2022 15:12:24 +0800
Subject: [PATCH] Fix goodix touch driver build error

Fix goodix touch driver build error that variable defined but not
used and return value not match.

Change-Id: Ibded582ff67e524be8b148592e8577f4864417c8
Reviewed-on: https://gerrit.mot.com/2265448
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Jichao Zou <zoujc@motorola.com>
Submit-Approved: Jira Key
---
 drivers/input/touchscreen/goodix_berlin_mmi/Android.mk        | 2 +-
 .../input/touchscreen/goodix_berlin_mmi/goodix_brl_fwupdate.c | 2 --
 drivers/input/touchscreen/goodix_berlin_mmi/goodix_brl_hw.c   | 4 ++--
 drivers/input/touchscreen/goodix_berlin_mmi/goodix_ts_mmi.h   | 2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/drivers/input/touchscreen/goodix_berlin_mmi/Android.mk b/drivers/input/touchscreen/goodix_berlin_mmi/Android.mk
index 6a7d2046e665..c5a062dd88fb 100644
--- a/drivers/input/touchscreen/goodix_berlin_mmi/Android.mk
+++ b/drivers/input/touchscreen/goodix_berlin_mmi/Android.mk
@@ -10,7 +10,7 @@ ifeq ($(DRM_PANEL_NOTIFICATIONS),true)
 endif
 
 ifeq ($(TOUCHSCREEN_GOODIX_BRL_SPI),true)
-	KERNEL_CFLAGS += CONFIG_TOUCHSCREEN_GOODIX_BRL_SPI=y
+	KBUILD_OPTIONS += CONFIG_TOUCHSCREEN_GOODIX_BRL_SPI=y
 endif
 
 ifeq ($(GTP_LIMIT_USE_SUPPLIER),true)
diff --git a/drivers/input/touchscreen/goodix_berlin_mmi/goodix_brl_fwupdate.c b/drivers/input/touchscreen/goodix_berlin_mmi/goodix_brl_fwupdate.c
index 05a4366a8a14..6c05a3b08aae 100644
--- a/drivers/input/touchscreen/goodix_berlin_mmi/goodix_brl_fwupdate.c
+++ b/drivers/input/touchscreen/goodix_berlin_mmi/goodix_brl_fwupdate.c
@@ -1269,7 +1269,6 @@ static inline void goodix_release_firmware(struct firmware_data *fw_data)
 static int goodix_fw_update_thread(void *data)
 {
 	struct fw_update_ctrl *fwu_ctrl = data;
-	struct firmware *temp_firmware = NULL;
 	ktime_t start, end;
 	int r = -EINVAL;
 
@@ -1308,7 +1307,6 @@ static int goodix_fw_update_thread(void *data)
 	if (fwu_ctrl->mode & UPDATE_MODE_SRC_HEAD) {
 		kfree(fwu_ctrl->fw_data.firmware);
 		fwu_ctrl->fw_data.firmware = NULL;
-		temp_firmware = NULL;
 	} else if (fwu_ctrl->mode & UPDATE_MODE_SRC_REQUEST) {
 		goodix_release_firmware(&fwu_ctrl->fw_data);
 	}
diff --git a/drivers/input/touchscreen/goodix_berlin_mmi/goodix_brl_hw.c b/drivers/input/touchscreen/goodix_berlin_mmi/goodix_brl_hw.c
index e231c03cfda7..97380020f740 100644
--- a/drivers/input/touchscreen/goodix_berlin_mmi/goodix_brl_hw.c
+++ b/drivers/input/touchscreen/goodix_berlin_mmi/goodix_brl_hw.c
@@ -1014,7 +1014,7 @@ static unsigned int goodix_pen_btn_code[] = {BTN_STYLUS, BTN_STYLUS2};
 static void goodix_parse_pen(struct goodix_pen_data *pen_data,
 	u8 *buf, int touch_num)
 {
-	unsigned int id = 0;
+	//unsigned int id = 0;
 	u8 cur_key_map = 0;
 	u8 *coor_data;
 	int16_t x_angle, y_angle;
@@ -1026,7 +1026,7 @@ static void goodix_parse_pen(struct goodix_pen_data *pen_data,
 		pen_data->coords.status = TS_TOUCH;
 		coor_data = &buf[IRQ_EVENT_HEAD_LEN];
 
-		id = (coor_data[0] >> 4) & 0x0F;
+		//id = (coor_data[0] >> 4) & 0x0F;
 		pen_data->coords.x = le16_to_cpup((__le16 *)(coor_data + 2));
 		pen_data->coords.y = le16_to_cpup((__le16 *)(coor_data + 4));
 		pen_data->coords.p = le16_to_cpup((__le16 *)(coor_data + 6));
diff --git a/drivers/input/touchscreen/goodix_berlin_mmi/goodix_ts_mmi.h b/drivers/input/touchscreen/goodix_berlin_mmi/goodix_ts_mmi.h
index 43203965608a..6062d36a8a79 100644
--- a/drivers/input/touchscreen/goodix_berlin_mmi/goodix_ts_mmi.h
+++ b/drivers/input/touchscreen/goodix_berlin_mmi/goodix_ts_mmi.h
@@ -24,7 +24,7 @@ void goodix_ts_mmi_dev_unregister(struct platform_device *ts_device);
 static int inline goodix_ts_mmi_dev_register(struct platform_device *ts_device) {
 	return -ENOSYS;
 }
-static void inline goodix_ts_mmi_dev_unregister(struct platform_device *ts_device) {
+static int inline goodix_ts_mmi_dev_unregister(struct platform_device *ts_device) {
 	return -ENOSYS;
 }
 #endif