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

Commit b4599ab3 authored by Amy Maloche's avatar Amy Maloche Committed by Sudhakar Manapati
Browse files

input: synaptics: Register sysfs entries with i2c client 



Register sysfs entries with i2c client instead of input
device.  This is standardized across touchscreen drivers.

This patch is propagated from msm-3.4 kernel.
(commit: 4d54ac4ce9511ff6d3dff2804e9794a109bbe529
input: synaptics: Register sysfs entries with i2c client)

Change-Id: I90140d2cd33287f7b090b5ed5275aa3b75999d0b
Signed-off-by: default avatarAmy Maloche <amaloche@codeaurora.org>
parent 70e89067

drivers/input/touchscreen/synaptics_fw_update.c

+2 −2
Original line number Diff line number Diff line
@@ -1746,7 +1746,7 @@ static int synaptics_rmi4_fwu_init(struct synaptics_rmi4_data *rmi4_data) 
	fwu->initialized = true;

	fwu->force_update = FORCE_UPDATE;



	retval = sysfs_create_bin_file(&rmi4_data->input_dev->dev.kobj,

	retval = sysfs_create_bin_file(&rmi4_data->i2c_client->dev.kobj,

			&dev_attr_data);

	if (retval < 0) {

		dev_err(&rmi4_data->i2c_client->dev,
@@ -1756,7 +1756,7 @@ static int synaptics_rmi4_fwu_init(struct synaptics_rmi4_data *rmi4_data) 
	}



	for (attr_count = 0; attr_count < ARRAY_SIZE(attrs); attr_count++) {

		retval = sysfs_create_file(&rmi4_data->input_dev->dev.kobj,

		retval = sysfs_create_file(&rmi4_data->i2c_client->dev.kobj,

				&attrs[attr_count].attr);

		if (retval < 0) {

			dev_err(&rmi4_data->i2c_client->dev,

drivers/input/touchscreen/synaptics_i2c_rmi4.c

+1 −1
Original line number Diff line number Diff line
@@ -2270,7 +2270,7 @@ static int synaptics_rmi4_probe(struct i2c_client *client, 
	}



	for (attr_count = 0; attr_count < ARRAY_SIZE(attrs); attr_count++) {

		retval = sysfs_create_file(&rmi4_data->input_dev->dev.kobj,

		retval = sysfs_create_file(&client->dev.kobj,

				&attrs[attr_count].attr);

		if (retval < 0) {

			dev_err(&client->dev,