aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuenter Roeck <linux@roeck-us.net>2017-01-22 20:19:12 -0500
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2017-01-22 20:22:31 -0500
commitcefb26d4b37c329f624eb235a1bdc7b6b8dd9430 (patch)
treeea5384a9067c7949dafe1e1a84b3c88e1b97c980
parent86178c8634ff8abe04933839d009c4440213040f (diff)
Input: touchscreen - drop unnecessary calls to input_set_drvdata
Since there is no call to dev_get_drvdata() or input_get_drvdata(), the call to input_set_drvdata() is unnecessary and can be dropped. Signed-off-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-rw-r--r--drivers/input/touchscreen/edt-ft5x06.c1
-rw-r--r--drivers/input/touchscreen/egalax_ts.c2
-rw-r--r--drivers/input/touchscreen/elants_i2c.c2
-rw-r--r--drivers/input/touchscreen/ili210x.c1
-rw-r--r--drivers/input/touchscreen/mcs5000_ts.c1
-rw-r--r--drivers/input/touchscreen/raydium_i2c_ts.c2
6 files changed, 0 insertions, 9 deletions
diff --git a/drivers/input/touchscreen/edt-ft5x06.c b/drivers/input/touchscreen/edt-ft5x06.c
index 8fc629fb023f..8cf8d8d5d4ef 100644
--- a/drivers/input/touchscreen/edt-ft5x06.c
+++ b/drivers/input/touchscreen/edt-ft5x06.c
@@ -982,7 +982,6 @@ static int edt_ft5x06_ts_probe(struct i2c_client *client,
982 return error; 982 return error;
983 } 983 }
984 984
985 input_set_drvdata(input, tsdata);
986 i2c_set_clientdata(client, tsdata); 985 i2c_set_clientdata(client, tsdata);
987 986
988 irq_flags = irq_get_trigger_type(client->irq); 987 irq_flags = irq_get_trigger_type(client->irq);
diff --git a/drivers/input/touchscreen/egalax_ts.c b/drivers/input/touchscreen/egalax_ts.c
index 3592a946950b..752ae9cf4514 100644
--- a/drivers/input/touchscreen/egalax_ts.c
+++ b/drivers/input/touchscreen/egalax_ts.c
@@ -214,8 +214,6 @@ static int egalax_ts_probe(struct i2c_client *client,
214 ABS_MT_POSITION_Y, 0, EGALAX_MAX_Y, 0, 0); 214 ABS_MT_POSITION_Y, 0, EGALAX_MAX_Y, 0, 0);
215 input_mt_init_slots(input_dev, MAX_SUPPORT_POINTS, 0); 215 input_mt_init_slots(input_dev, MAX_SUPPORT_POINTS, 0);
216 216
217 input_set_drvdata(input_dev, ts);
218
219 error = devm_request_threaded_irq(&client->dev, client->irq, NULL, 217 error = devm_request_threaded_irq(&client->dev, client->irq, NULL,
220 egalax_ts_interrupt, 218 egalax_ts_interrupt,
221 IRQF_TRIGGER_LOW | IRQF_ONESHOT, 219 IRQF_TRIGGER_LOW | IRQF_ONESHOT,
diff --git a/drivers/input/touchscreen/elants_i2c.c b/drivers/input/touchscreen/elants_i2c.c
index 02aec284deca..740e4483f4fd 100644
--- a/drivers/input/touchscreen/elants_i2c.c
+++ b/drivers/input/touchscreen/elants_i2c.c
@@ -1260,8 +1260,6 @@ static int elants_i2c_probe(struct i2c_client *client,
1260 input_abs_set_res(ts->input, ABS_MT_POSITION_X, ts->x_res); 1260 input_abs_set_res(ts->input, ABS_MT_POSITION_X, ts->x_res);
1261 input_abs_set_res(ts->input, ABS_MT_POSITION_Y, ts->y_res); 1261 input_abs_set_res(ts->input, ABS_MT_POSITION_Y, ts->y_res);
1262 1262
1263 input_set_drvdata(ts->input, ts);
1264
1265 error = input_register_device(ts->input); 1263 error = input_register_device(ts->input);
1266 if (error) { 1264 if (error) {
1267 dev_err(&client->dev, 1265 dev_err(&client->dev,
diff --git a/drivers/input/touchscreen/ili210x.c b/drivers/input/touchscreen/ili210x.c
index 91dc5fb34fe1..6f76eeedf465 100644
--- a/drivers/input/touchscreen/ili210x.c
+++ b/drivers/input/touchscreen/ili210x.c
@@ -256,7 +256,6 @@ static int ili210x_i2c_probe(struct i2c_client *client,
256 input_set_abs_params(input, ABS_MT_POSITION_X, 0, xmax, 0, 0); 256 input_set_abs_params(input, ABS_MT_POSITION_X, 0, xmax, 0, 0);
257 input_set_abs_params(input, ABS_MT_POSITION_Y, 0, ymax, 0, 0); 257 input_set_abs_params(input, ABS_MT_POSITION_Y, 0, ymax, 0, 0);
258 258
259 input_set_drvdata(input, priv);
260 i2c_set_clientdata(client, priv); 259 i2c_set_clientdata(client, priv);
261 260
262 error = request_irq(client->irq, ili210x_irq, pdata->irq_flags, 261 error = request_irq(client->irq, ili210x_irq, pdata->irq_flags,
diff --git a/drivers/input/touchscreen/mcs5000_ts.c b/drivers/input/touchscreen/mcs5000_ts.c
index 8b47e1fecb25..90fc07dc98a6 100644
--- a/drivers/input/touchscreen/mcs5000_ts.c
+++ b/drivers/input/touchscreen/mcs5000_ts.c
@@ -221,7 +221,6 @@ static int mcs5000_ts_probe(struct i2c_client *client,
221 input_set_abs_params(input_dev, ABS_X, 0, MCS5000_MAX_XC, 0, 0); 221 input_set_abs_params(input_dev, ABS_X, 0, MCS5000_MAX_XC, 0, 0);
222 input_set_abs_params(input_dev, ABS_Y, 0, MCS5000_MAX_YC, 0, 0); 222 input_set_abs_params(input_dev, ABS_Y, 0, MCS5000_MAX_YC, 0, 0);
223 223
224 input_set_drvdata(input_dev, data);
225 data->input_dev = input_dev; 224 data->input_dev = input_dev;
226 225
227 if (pdata->cfg_pin) 226 if (pdata->cfg_pin)
diff --git a/drivers/input/touchscreen/raydium_i2c_ts.c b/drivers/input/touchscreen/raydium_i2c_ts.c
index 2658afa016c9..1252e49ccfa1 100644
--- a/drivers/input/touchscreen/raydium_i2c_ts.c
+++ b/drivers/input/touchscreen/raydium_i2c_ts.c
@@ -1087,8 +1087,6 @@ static int raydium_i2c_probe(struct i2c_client *client,
1087 ts->input->name = "Raydium Touchscreen"; 1087 ts->input->name = "Raydium Touchscreen";
1088 ts->input->id.bustype = BUS_I2C; 1088 ts->input->id.bustype = BUS_I2C;
1089 1089
1090 input_set_drvdata(ts->input, ts);
1091
1092 input_set_abs_params(ts->input, ABS_MT_POSITION_X, 1090 input_set_abs_params(ts->input, ABS_MT_POSITION_X,
1093 0, le16_to_cpu(ts->info.x_max), 0, 0); 1091 0, le16_to_cpu(ts->info.x_max), 0, 0);
1094 input_set_abs_params(ts->input, ABS_MT_POSITION_Y, 1092 input_set_abs_params(ts->input, ABS_MT_POSITION_Y,