linux-input.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/2] input: tsc2007: Convert msecs to jiffies only once
       [not found] <1273443062.19653.1427814254249.JavaMail.zimbra@xes-inc.com>
@ 2015-03-31 15:05 ` Aaron Sierra
  2015-03-31 21:41   ` Dmitry Torokhov
  0 siblings, 1 reply; 2+ messages in thread
From: Aaron Sierra @ 2015-03-31 15:05 UTC (permalink / raw)
  To: Kwangwoo Lee, Dmitry Torokhov, Thierry Reding, Philip Rakity; +Cc: linux-input

Eliminate redundant calculations by performing millisecond to jiffy
calculations once during driver initialization.

Signed-off-by: Aaron Sierra <asierra@xes-inc.com>
---
 drivers/input/touchscreen/tsc2007.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/drivers/input/touchscreen/tsc2007.c b/drivers/input/touchscreen/tsc2007.c
index 1bf9906..4e97afb 100644
--- a/drivers/input/touchscreen/tsc2007.c
+++ b/drivers/input/touchscreen/tsc2007.c
@@ -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");
@@ -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;
@@ -350,7 +349,9 @@ 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       = pdata->poll_period ?
+					msecs_to_jiffies(pdata->poll_period) :
+					msecs_to_jiffies(1);
 	ts->get_pendown_state = pdata->get_pendown_state;
 	ts->clear_penirq      = pdata->clear_penirq;
 	ts->fuzzx             = pdata->fuzzx;
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH 1/2] input: tsc2007: Convert msecs to jiffies only once
  2015-03-31 15:05 ` [PATCH 1/2] input: tsc2007: Convert msecs to jiffies only once Aaron Sierra
@ 2015-03-31 21:41   ` Dmitry Torokhov
  0 siblings, 0 replies; 2+ messages in thread
From: Dmitry Torokhov @ 2015-03-31 21:41 UTC (permalink / raw)
  To: Aaron Sierra; +Cc: Kwangwoo Lee, Thierry Reding, Philip Rakity, linux-input

On Tue, Mar 31, 2015 at 10:05:59AM -0500, Aaron Sierra wrote:
> Eliminate redundant calculations by performing millisecond to jiffy
> calculations once during driver initialization.
> 
> Signed-off-by: Aaron Sierra <asierra@xes-inc.com>

Applied, thank you.

> ---
>  drivers/input/touchscreen/tsc2007.c | 11 ++++++-----
>  1 file changed, 6 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/input/touchscreen/tsc2007.c b/drivers/input/touchscreen/tsc2007.c
> index 1bf9906..4e97afb 100644
> --- a/drivers/input/touchscreen/tsc2007.c
> +++ b/drivers/input/touchscreen/tsc2007.c
> @@ -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");
> @@ -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;
> @@ -350,7 +349,9 @@ 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       = pdata->poll_period ?
> +					msecs_to_jiffies(pdata->poll_period) :
> +					msecs_to_jiffies(1);
>  	ts->get_pendown_state = pdata->get_pendown_state;
>  	ts->clear_penirq      = pdata->clear_penirq;
>  	ts->fuzzx             = pdata->fuzzx;
> -- 
> 1.9.1

-- 
Dmitry

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2015-03-31 21:41 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
     [not found] <1273443062.19653.1427814254249.JavaMail.zimbra@xes-inc.com>
2015-03-31 15:05 ` [PATCH 1/2] input: tsc2007: Convert msecs to jiffies only once Aaron Sierra
2015-03-31 21:41   ` Dmitry Torokhov

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).