renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-28 23:23:55 +08:00
Code

Input: tsc2005 - do not rearm timer in hardirq handler

Browse Source 
We will most likely rearm it yet again the IRQ thread so doing it here
is pointless.

Tested-by: Aaro Koskinen <aaro.koskinen@nokia.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
This commit is contained in:
Dmitry Torokhov 2011-03-16 22:11:14 -07:00
parent 80cc2f0c92
commit dacb650f12
1 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/input/touchscreen/tsc2005.c
View File

@ -225,17 +225,6 @@ static void tsc2005_update_pen_state(struct tsc2005 *ts,
pressure); pressure);
} }
static irqreturn_t tsc2005_irq_handler(int irq, void *dev_id)
{
struct tsc2005 *ts = dev_id;
/* update the penup timer only if it's pending */
mod_timer_pending(&ts->penup_timer,
jiffies + msecs_to_jiffies(TSC2005_PENUP_TIME_MS));
return IRQ_WAKE_THREAD;
}
static irqreturn_t tsc2005_irq_thread(int irq, void *_ts) static irqreturn_t tsc2005_irq_thread(int irq, void *_ts)
{ {
struct tsc2005 *ts = _ts; struct tsc2005 *ts = _ts;
@ -596,8 +585,7 @@ static int __devinit tsc2005_probe(struct spi_device *spi)
input_set_abs_params(input_dev, ABS_Y, 0, max_y, fudge_y, 0); input_set_abs_params(input_dev, ABS_Y, 0, max_y, fudge_y, 0);
input_set_abs_params(input_dev, ABS_PRESSURE, 0, max_p, fudge_p, 0); input_set_abs_params(input_dev, ABS_PRESSURE, 0, max_p, fudge_p, 0);
error = request_threaded_irq(spi->irq, error = request_threaded_irq(spi->irq, NULL, tsc2005_irq_thread,
tsc2005_irq_handler, tsc2005_irq_thread,
IRQF_TRIGGER_RISING, "tsc2005", ts); IRQF_TRIGGER_RISING, "tsc2005", ts);
if (error) { if (error) {
dev_err(&spi->dev, "Failed to request irq, err: %d\n", error); dev_err(&spi->dev, "Failed to request irq, err: %d\n", error);