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

Commit 4ac638b2 authored by Naveen Kumar Gaddipati's avatar Naveen Kumar Gaddipati Committed by Greg Kroah-Hartman
Browse files

staging: synaptics: Update with the kernel object name of touch device 



Update with the kernel object name of touch device for getting
the regulator of the synaptics rmi4 touch device.

Signed-off-by: default avatarNaveen Kumar Gaddipati <naveen.gaddipati@stericsson.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 3ec6080e

drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c

+2 −4
Original line number Diff line number Diff line
@@ -924,10 +924,8 @@ static int __devinit synaptics_rmi4_probe 
		goto err_input;

	}



	dev_set_name(&client->dev, platformdata->name);



	if (platformdata->regulator_en) {

		rmi4_data->regulator = regulator_get(&client->dev, "v-touch");

		rmi4_data->regulator = regulator_get(&client->dev, "vdd");

		if (IS_ERR(rmi4_data->regulator)) {

			dev_err(&client->dev, "%s:get regulator failed\n",

								__func__);
@@ -999,7 +997,7 @@ static int __devinit synaptics_rmi4_probe 
	retval = request_threaded_irq(platformdata->irq_number, NULL,

					synaptics_rmi4_irq,

					platformdata->irq_type,

					platformdata->name, rmi4_data);

					DRIVER_NAME, rmi4_data);

	if (retval) {

		dev_err(&client->dev, "%s:Unable to get attn irq %d\n",

				__func__, platformdata->irq_number);

drivers/staging/ste_rmi4/synaptics_i2c_rmi4.h

+0 −1
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ 
 * This structure gives platform data for rmi4.

 */

struct synaptics_rmi4_platform_data {

	const char *name;

	int irq_number;

	int irq_type;

	bool x_flip;