Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cc95c37e authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "input: touchscreen: Remove redundant code from Goodix driver"

parents e57a1bb9 5da10ccf

drivers/input/touchscreen/gt9xx/gt9xx.h

+0 −5
Original line number Diff line number Diff line
@@ -111,11 +111,6 @@ extern u16 total_len; 
#define GTP_CHANGE_X2Y			0

#define GTP_DRIVER_SEND_CFG		1

#define GTP_HAVE_TOUCH_KEY		1



/* auto updated by head_fw_array in gt9xx_firmware.h,

 * function together with CONFIG_GT9XX_TOUCHPANEL_UPDATE */

#define GTP_HEADER_FW_UPDATE	0



#define GTP_ESD_PROTECT			0

#define GTP_WITH_PEN			0

drivers/input/touchscreen/gt9xx/gt9xx_update.c

+0 −26
Original line number Diff line number Diff line
@@ -36,11 +36,6 @@ 
#include <linux/workqueue.h>

#include <linux/kernel.h>



#if GTP_HEADER_FW_UPDATE

#include <linux/namei.h>

#include <linux/mount.h>

#endif



#define FIRMWARE_NAME_LEN_MAX		256



#define GUP_REG_HW_INFO             0x4220
@@ -641,26 +636,6 @@ static s8 gup_update_config(struct i2c_client *client, 
	return ret;

}



#if GTP_HEADER_FW_UPDATE

static u32 gup_get firmware_file(struct i2c_client,

		struct st_update_msg *msg, u8 *path)

{

	if (sizeiof(header_fw_array) < (FW_HEAD_LENGTH +

				FW_SECTION_LENGTH * 4 +

				FW_DSP_ISP_LENGTH +

				FW_DSP_LENGTH +

				FW_BOOT_LENGTH)) {

		dev_err(&client->dev,

			"INVALID header_fw_array!");

		return -EINVAL;

	}

	msg->fw_data = (u8 *)header_fw_array;

	msg->fw_len = sizeof(header_fw_array);

	dev_dbg(&client->dev, "Found firmware from header file, len=%d",

		msg->fw_len);

	return 0;

}

#else

static s32 gup_get_firmware_file(struct i2c_client *client,

		struct st_update_msg *msg, u8 *path)

{
@@ -690,7 +665,6 @@ static s32 gup_get_firmware_file(struct i2c_client *client, 
	release_firmware(fw);

	return 0;

}

#endif



static u8 gup_check_firmware_name(struct i2c_client *client,

					u8 **path_p)