Skip to content

Commit

Permalink
Input: tsc2007 - Convert msecs to jiffies only once
Browse files Browse the repository at this point in the history
Eliminate redundant calculations by performing millisecond to jiffy
calculations once during driver initialization.

Signed-off-by: Aaron Sierra <[email protected]>
Signed-off-by: Dmitry Torokhov <[email protected]>
  • Loading branch information
Aaron Sierra authored and dtor committed Mar 31, 2015
1 parent 709583e commit bbdb38a
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions drivers/input/touchscreen/tsc2007.c
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ struct tsc2007 {
u16 model;
u16 x_plate_ohms;
u16 max_rt;
unsigned long poll_period;
unsigned long poll_period; /* in jiffies */
int fuzzx;
int fuzzy;
int fuzzz;
Expand Down Expand Up @@ -214,8 +214,7 @@ static irqreturn_t tsc2007_soft_irq(int irq, void *handle)
dev_dbg(&ts->client->dev, "ignored pressure %d\n", rt);
}

wait_event_timeout(ts->wait, ts->stopped,
msecs_to_jiffies(ts->poll_period));
wait_event_timeout(ts->wait, ts->stopped, ts->poll_period);
}

dev_dbg(&ts->client->dev, "UP\n");
Expand Down Expand Up @@ -314,9 +313,9 @@ static int tsc2007_probe_dt(struct i2c_client *client, struct tsc2007 *ts)
ts->fuzzz = val32;

if (!of_property_read_u64(np, "ti,poll-period", &val64))
ts->poll_period = val64;
ts->poll_period = msecs_to_jiffies(val64);
else
ts->poll_period = 1;
ts->poll_period = msecs_to_jiffies(1);

if (!of_property_read_u32(np, "ti,x-plate-ohms", &val32)) {
ts->x_plate_ohms = val32;
Expand Down Expand Up @@ -350,7 +349,7 @@ static int tsc2007_probe_pdev(struct i2c_client *client, struct tsc2007 *ts,
ts->model = pdata->model;
ts->x_plate_ohms = pdata->x_plate_ohms;
ts->max_rt = pdata->max_rt ? : MAX_12BIT;
ts->poll_period = pdata->poll_period ? : 1;
ts->poll_period = msecs_to_jiffies(pdata->poll_period ? : 1);
ts->get_pendown_state = pdata->get_pendown_state;
ts->clear_penirq = pdata->clear_penirq;
ts->fuzzx = pdata->fuzzx;
Expand Down

0 comments on commit bbdb38a

Please sign in to comment.