Merge "input: touchscreen: cyttsp5: fix compilation warnings" (2aa8d916) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/input/touchscreen/cyttsp5/cyttsp5_device_access.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1666,11 +1666,11 @@ static ssize_t cyttsp5_cmcp_test_show(struct device *dev,
		if (no_builtin_file)
		goto no_builtin;

		if (test_item && CM_ENABLED)
		if (test_item & CM_ENABLED)
		validate_cm_test_results(dev, configuration, cmcp_info,
		result, &final_pass, test_item);

		if (test_item && CP_ENABLED)
		if (test_item & CP_ENABLED)
		validate_cp_test_results(dev, configuration, cmcp_info,
		result, &final_pass, test_item);
		no_builtin:

drivers/input/touchscreen/cyttsp5/cyttsp5_loader.c

+9 −11

Original line number	Diff line number	Diff line
		@@ -115,7 +115,7 @@ static inline struct cyttsp5_loader_data *cyttsp5_get_loader_data(
		return cyttsp5_get_module_data(dev, &loader_module);
		}

		#if CYTTSP5_FW_UPGRADE \
		#if defined(CYTTSP5_FW_UPGRADE) \
		\|\| defined(CONFIG_TOUCHSCREEN_CYPRESS_CYTTSP5_PLATFORM_TTCONFIG_UPGRADE)
		static u8 cyttsp5_get_panel_id(struct device *dev)
		{
		@@ -125,7 +125,7 @@ static u8 cyttsp5_get_panel_id(struct device *dev)
		}
		#endif

		#if CYTTSP5_FW_UPGRADE \|\| CYTTSP5_TTCONFIG_UPGRADE
		#if defined(CYTTSP5_FW_UPGRADE) \|\| defined(CYTTSP5_TTCONFIG_UPGRADE)
		/*
		* return code:
		* -1: Do not upgrade firmware
		@@ -230,7 +230,7 @@ static int cyttsp5_calibration_attention(struct device *dev)

		#endif /* CYTTSP5_FW_UPGRADE \|\| CYTTSP5_TTCONFIG_UPGRADE */

		#if CYTTSP5_FW_UPGRADE
		#ifdef CYTTSP5_FW_UPGRADE
		static u8 cyttsp5_get_row_(struct device dev, u8 *row_buf,
		u8 *image_buf, int size)
		{
		@@ -826,7 +826,7 @@ static int upgrade_firmware_from_builtin(struct device *dev)
		}
		#endif /* CONFIG_TOUCHSCREEN_CYPRESS_CYTTSP5_BINARY_FW_UPGRADE */

		#if CYTTSP5_TTCONFIG_UPGRADE
		#ifdef CONFIG_TOUCHSCREEN_CYPRESS_CYTTSP5_MANUAL_TTCONFIG_UPGRADE
		static int cyttsp5_write_config_row_(struct device *dev, u8 ebid,
		u16 row_number, u16 row_size, u8 *data)
		{
		@@ -967,9 +967,7 @@ static int cyttsp5_upgrade_ttconfig(struct device *dev,

		return rc;
		}
		#endif /* CYTTSP5_TTCONFIG_UPGRADE */

		#ifdef CONFIG_TOUCHSCREEN_CYPRESS_CYTTSP5_PLATFORM_TTCONFIG_UPGRADE
		static int cyttsp5_get_ttconfig_crc(struct device *dev,
		const u8 ttconfig_data, int ttconfig_size, u16 crc)
		{
		@@ -1358,7 +1356,7 @@ static void cyttsp5_fw_and_config_upgrade(
		if (!ld->si)
		dev_err(dev, "%s: Fail get sysinfo pointer from core\n",
		__func__);
		#if !CYTTSP5_FW_UPGRADE
		#if !defined(CYTTSP5_FW_UPGRADE)
		dev_info(dev, "%s: No FW upgrade method selected!\n", __func__);
		#endif

		@@ -1378,7 +1376,7 @@ static void cyttsp5_fw_and_config_upgrade(
		#endif
		}

		#if CYTTSP5_FW_UPGRADE
		#ifdef CYTTSP5_FW_UPGRADE
		static int cyttsp5_fw_upgrade_cb(struct device *dev)
		{
		#ifdef CONFIG_TOUCHSCREEN_CYPRESS_CYTTSP5_PLATFORM_FW_UPGRADE
		@@ -1489,7 +1487,7 @@ static int cyttsp5_loader_probe(struct device dev, void *data)
		ld->dev = dev;
		*data = ld;

		#if CYTTSP5_FW_UPGRADE
		#ifdef CYTTSP5_FW_UPGRADE
		init_completion(&ld->int_running);
		#ifdef CONFIG_TOUCHSCREEN_CYPRESS_CYTTSP5_BINARY_FW_UPGRADE
		init_completion(&ld->builtin_bin_fw_complete);
		@@ -1500,7 +1498,7 @@ static int cyttsp5_loader_probe(struct device dev, void *data)
		cmd->subscribe_attention(dev, CY_ATTEN_LOADER, CYTTSP5_LOADER_NAME,
		cyttsp5_fw_upgrade_cb, CY_MODE_UNKNOWN);
		#endif
		#if CYTTSP5_FW_UPGRADE \|\| CYTTSP5_TTCONFIG_UPGRADE
		#if defined(CYTTSP5_FW_UPGRADE) \|\| defined(CYTTSP5_TTCONFIG_UPGRADE)
		init_completion(&ld->calibration_complete);
		INIT_WORK(&ld->calibration_work, cyttsp5_calibrate_idacs);
		#endif
		@@ -1543,7 +1541,7 @@ static void cyttsp5_loader_release(struct device dev, void data)
		{
		struct cyttsp5_loader_data ld = (struct cyttsp5_loader_data )data;

		#if CYTTSP5_FW_UPGRADE
		#ifdef CYTTSP5_FW_UPGRADE
		cmd->unsubscribe_attention(dev, CY_ATTEN_IRQ, CYTTSP5_LOADER_NAME,
		cyttsp5_loader_attention, CY_MODE_BOOTLOADER);