Merge "input: synaptics: Fix compilation errors on msm-3.18 kernel" (f9c62c23) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/input/touchscreen/synaptics_fw_update.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -810,8 +810,7 @@ static enum flash_area fwu_go_nogo(void)
		sizeof(fwu->image_name));
		if (!strptr) {
		dev_err(&i2c_client->dev,
		"No valid PR number (PRxxxxxxx)",
		"found in image file name...\n");
		"No valid PR number found in image file name...\n");
		goto exit;
		}

		@@ -884,7 +883,7 @@ exit:
		kfree(imagePR);
		if (flash_area == MISMATCH)
		dev_info(&i2c_client->dev,
		"%s: Package ID indicates mismatch of firmware and",
		"%s: Package ID indicates mismatch of firmware and"
		" controller compatibility\n", __func__);
		else if (flash_area == NONE)
		dev_info(&i2c_client->dev,

drivers/input/touchscreen/synaptics_i2c_rmi4.c

+40 −44

Original line number	Diff line number	Diff line
		@@ -191,7 +191,6 @@ static int synaptics_rmi4_capacitance_button_map(
		struct synaptics_rmi4_data *rmi4_data,
		struct synaptics_rmi4_fn *fhandler);


		static irqreturn_t synaptics_rmi4_irq(int irq, void *data);

		#if defined(CONFIG_SECURE_TOUCH)
		@@ -642,8 +641,8 @@ static ssize_t synaptics_secure_touch_enable_store(struct device *dev,
		err = -EIO;
		break;
		}
		INIT_COMPLETION(data->st_powerdown);
		INIT_COMPLETION(data->st_irq_processed);
		reinit_completion(&data->st_powerdown);
		reinit_completion(&data->st_irq_processed);
		atomic_set(&data->st_enabled, 1);
		atomic_set(&data->st_pending_irqs, 0);
		break;
		@@ -2444,7 +2443,7 @@ static int synaptics_rmi4_capacitance_button_map(
		"%s: Button map is missing in board file\n",
		__func__);
		return -ENODEV;
		}
		} else {
		if (pdata->capacitance_button_map->nbuttons !=
		f1a->button_count) {
		f1a->valid_button_count = min(f1a->button_count,
		@@ -2456,6 +2455,7 @@ static int synaptics_rmi4_capacitance_button_map(
		for (ii = 0; ii < f1a->valid_button_count; ii++)
		f1a->button_map[ii] =
		pdata->capacitance_button_map->map[ii];
		}

		return 0;
		}
		@@ -3308,8 +3308,8 @@ static int synaptics_rmi4_gpio_configure(struct synaptics_rmi4_data *rmi4_data,
		irq_gpio);
		if (retval) {
		dev_err(&rmi4_data->i2c_client->dev,
		"unable to set direction for gpio ",
		"[%d]\n", rmi4_data->board->irq_gpio);
		"unable to set direction for gpio [%d]\n",
		rmi4_data->board->irq_gpio);
		goto err_irq_gpio_dir;
		}
		} else {
		@@ -3333,8 +3333,8 @@ static int synaptics_rmi4_gpio_configure(struct synaptics_rmi4_data *rmi4_data,
		reset_gpio, 1);
		if (retval) {
		dev_err(&rmi4_data->i2c_client->dev,
		"unable to set direction for gpio ",
		"[%d]\n", rmi4_data->board->reset_gpio);
		"unable to set direction for gpio [%d]\n",
		rmi4_data->board->reset_gpio);
		goto err_reset_gpio_dir;
		}

		@@ -3344,7 +3344,7 @@ static int synaptics_rmi4_gpio_configure(struct synaptics_rmi4_data *rmi4_data,
		synaptics_rmi4_reset_command(rmi4_data);

		return 0;
		} else {
		}
		if (rmi4_data->board->disable_gpios) {
		if (gpio_is_valid(rmi4_data->board->irq_gpio))
		gpio_free(rmi4_data->board->irq_gpio);
		@@ -3359,16 +3359,13 @@ static int synaptics_rmi4_gpio_configure(struct synaptics_rmi4_data *rmi4_data,
		board->reset_gpio);
		if (retval) {
		dev_err(&rmi4_data->i2c_client->dev,
		"unable to set direction for gpio ",
		"[%d]\n", rmi4_data->board->irq_gpio);
		"unable to set direction for gpio [%d]\n",
		rmi4_data->board->irq_gpio);
		}
		gpio_free(rmi4_data->board->reset_gpio);
		}
		}

		return 0;
		}

		return 0;

		err_reset_gpio_dir:
		@@ -4028,8 +4025,7 @@ static int synaptics_rmi4_regulator_lpm(struct synaptics_rmi4_data *rmi4_data,
		load_ua);
		if (retval < 0) {
		dev_err(&rmi4_data->i2c_client->dev,
		"Regulator vcc_i2c set_opt failed ",
		"rc=%d\n", retval);
		"Regulator vcc_i2c set_opt failed rc=%d\n", retval);
		goto fail_regulator_lpm;
		}

		@@ -4037,8 +4033,8 @@ static int synaptics_rmi4_regulator_lpm(struct synaptics_rmi4_data *rmi4_data,
		retval = regulator_disable(rmi4_data->vcc_i2c);
		if (retval) {
		dev_err(&rmi4_data->i2c_client->dev,
		"Regulator vcc_i2c disable failed ",
		"rc=%d\n", retval);
		"Regulator vcc_i2c disable failed rc=%d\n",
		retval);
		goto fail_regulator_lpm;
		}
		}
		@@ -4100,8 +4096,8 @@ regulator_hpm:
		retval = regulator_enable(rmi4_data->vcc_i2c);
		if (retval) {
		dev_err(&rmi4_data->i2c_client->dev,
		"Regulator vcc_i2c enable failed ",
		"rc=%d\n", retval);
		"Regulator vcc_i2c enable failed rc=%d\n",
		retval);
		goto fail_regulator_hpm;
		}
		}