A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-10 22:40:54 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix goodix touch driver build error

Browse source 
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
This commit is contained in:
litong20 2022-05-14 15:12:24 +08:00 • committed by zhuwg1
commit de4584117f
4 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
drivers/input/touchscreen/goodix_berlin_mmi/Android.mk
View file

@ -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)

2
drivers/input/touchscreen/goodix_berlin_mmi/goodix_brl_fwupdate.c
View file

@ -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);
}

4
drivers/input/touchscreen/goodix_berlin_mmi/goodix_brl_hw.c
View file

@ -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));

2
drivers/input/touchscreen/goodix_berlin_mmi/goodix_ts_mmi.h
View file

@ -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