diff options
author | Aaron Sierra <asierra@xes-inc.com> | 2015-03-31 17:35:36 -0400 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-03-31 17:41:33 -0400 |
commit | bbdb38a22e8a5197a6db1e4d22d7e5c6c368e7f7 (patch) | |
tree | 10d1a20387b6dec70099c808d87a3e15217e0a3a | |
parent | 709583e894afad7f33add66953026ceb82cdf115 (diff) |
Input: tsc2007 - Convert msecs to jiffies only once
Eliminate redundant calculations by performing millisecond to jiffy
calculations once during driver initialization.
Signed-off-by: Aaron Sierra <asierra@xes-inc.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-rw-r--r-- | drivers/input/touchscreen/tsc2007.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/input/touchscreen/tsc2007.c b/drivers/input/touchscreen/tsc2007.c index 1bf9906b5a3f..ccc8aa615709 100644 --- a/drivers/input/touchscreen/tsc2007.c +++ b/drivers/input/touchscreen/tsc2007.c | |||
@@ -75,7 +75,7 @@ struct tsc2007 { | |||
75 | u16 model; | 75 | u16 model; |
76 | u16 x_plate_ohms; | 76 | u16 x_plate_ohms; |
77 | u16 max_rt; | 77 | u16 max_rt; |
78 | unsigned long poll_period; | 78 | unsigned long poll_period; /* in jiffies */ |
79 | int fuzzx; | 79 | int fuzzx; |
80 | int fuzzy; | 80 | int fuzzy; |
81 | int fuzzz; | 81 | int fuzzz; |
@@ -214,8 +214,7 @@ static irqreturn_t tsc2007_soft_irq(int irq, void *handle) | |||
214 | dev_dbg(&ts->client->dev, "ignored pressure %d\n", rt); | 214 | dev_dbg(&ts->client->dev, "ignored pressure %d\n", rt); |
215 | } | 215 | } |
216 | 216 | ||
217 | wait_event_timeout(ts->wait, ts->stopped, | 217 | wait_event_timeout(ts->wait, ts->stopped, ts->poll_period); |
218 | msecs_to_jiffies(ts->poll_period)); | ||
219 | } | 218 | } |
220 | 219 | ||
221 | dev_dbg(&ts->client->dev, "UP\n"); | 220 | dev_dbg(&ts->client->dev, "UP\n"); |
@@ -314,9 +313,9 @@ static int tsc2007_probe_dt(struct i2c_client *client, struct tsc2007 *ts) | |||
314 | ts->fuzzz = val32; | 313 | ts->fuzzz = val32; |
315 | 314 | ||
316 | if (!of_property_read_u64(np, "ti,poll-period", &val64)) | 315 | if (!of_property_read_u64(np, "ti,poll-period", &val64)) |
317 | ts->poll_period = val64; | 316 | ts->poll_period = msecs_to_jiffies(val64); |
318 | else | 317 | else |
319 | ts->poll_period = 1; | 318 | ts->poll_period = msecs_to_jiffies(1); |
320 | 319 | ||
321 | if (!of_property_read_u32(np, "ti,x-plate-ohms", &val32)) { | 320 | if (!of_property_read_u32(np, "ti,x-plate-ohms", &val32)) { |
322 | ts->x_plate_ohms = val32; | 321 | ts->x_plate_ohms = val32; |
@@ -350,7 +349,7 @@ static int tsc2007_probe_pdev(struct i2c_client *client, struct tsc2007 *ts, | |||
350 | ts->model = pdata->model; | 349 | ts->model = pdata->model; |
351 | ts->x_plate_ohms = pdata->x_plate_ohms; | 350 | ts->x_plate_ohms = pdata->x_plate_ohms; |
352 | ts->max_rt = pdata->max_rt ? : MAX_12BIT; | 351 | ts->max_rt = pdata->max_rt ? : MAX_12BIT; |
353 | ts->poll_period = pdata->poll_period ? : 1; | 352 | ts->poll_period = msecs_to_jiffies(pdata->poll_period ? : 1); |
354 | ts->get_pendown_state = pdata->get_pendown_state; | 353 | ts->get_pendown_state = pdata->get_pendown_state; |
355 | ts->clear_penirq = pdata->clear_penirq; | 354 | ts->clear_penirq = pdata->clear_penirq; |
356 | ts->fuzzx = pdata->fuzzx; | 355 | ts->fuzzx = pdata->fuzzx; |