aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/touchscreen
diff options
context:
space:
mode:
authorHeiko Stübner <heiko.stuebner@bqreaders.com>2014-01-27 15:32:38 -0500
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2014-01-28 01:35:18 -0500
commit8727336481a231ee986c214dde06338e7e52624c (patch)
tree37de6c88815d4de81f6fc6abb5d821feeca786be /drivers/input/touchscreen
parentd333b6062f1414622d1fe37314fa2ec9e3df402d (diff)
Input: zforce - use internal pdata pointer instead of dev_get_platdata
Devicetree support will be creating its own platfprm data structure that is not attached to the device. Let's use the internal pointer to the pdata instead of re-fetching it with dev_get_platdata(). Signed-off-by: Heiko Stuebner <heiko.stuebner@bqreaders.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input/touchscreen')
-rw-r--r--drivers/input/touchscreen/zforce_ts.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/input/touchscreen/zforce_ts.c b/drivers/input/touchscreen/zforce_ts.c
index 307f582eeabf..91f4c7cb5dd5 100644
--- a/drivers/input/touchscreen/zforce_ts.c
+++ b/drivers/input/touchscreen/zforce_ts.c
@@ -257,7 +257,7 @@ static int zforce_setconfig(struct zforce_ts *ts, char b1)
257static int zforce_start(struct zforce_ts *ts) 257static int zforce_start(struct zforce_ts *ts)
258{ 258{
259 struct i2c_client *client = ts->client; 259 struct i2c_client *client = ts->client;
260 const struct zforce_ts_platdata *pdata = dev_get_platdata(&client->dev); 260 const struct zforce_ts_platdata *pdata = ts->pdata;
261 int ret; 261 int ret;
262 262
263 dev_dbg(&client->dev, "starting device\n"); 263 dev_dbg(&client->dev, "starting device\n");
@@ -328,7 +328,7 @@ static int zforce_stop(struct zforce_ts *ts)
328static int zforce_touch_event(struct zforce_ts *ts, u8 *payload) 328static int zforce_touch_event(struct zforce_ts *ts, u8 *payload)
329{ 329{
330 struct i2c_client *client = ts->client; 330 struct i2c_client *client = ts->client;
331 const struct zforce_ts_platdata *pdata = dev_get_platdata(&client->dev); 331 const struct zforce_ts_platdata *pdata = ts->pdata;
332 struct zforce_point point; 332 struct zforce_point point;
333 int count, i, num = 0; 333 int count, i, num = 0;
334 334
@@ -463,7 +463,7 @@ static irqreturn_t zforce_interrupt(int irq, void *dev_id)
463{ 463{
464 struct zforce_ts *ts = dev_id; 464 struct zforce_ts *ts = dev_id;
465 struct i2c_client *client = ts->client; 465 struct i2c_client *client = ts->client;
466 const struct zforce_ts_platdata *pdata = dev_get_platdata(&client->dev); 466 const struct zforce_ts_platdata *pdata = ts->pdata;
467 int ret; 467 int ret;
468 u8 payload_buffer[FRAME_MAXSIZE]; 468 u8 payload_buffer[FRAME_MAXSIZE];
469 u8 *payload; 469 u8 *payload;