Skip to content

Commit

Permalink
Input: tsc2005 - do not rearm timer in hardirq handler
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Dmitry Torokhov committed Mar 17, 2011
1 parent 80cc2f0 commit dacb650
Showing 1 changed file with 1 addition and 13 deletions.
14 changes: 1 addition & 13 deletions drivers/input/touchscreen/tsc2005.c
Original file line number Diff line number Diff line change
Expand Up @@ -225,17 +225,6 @@ static void tsc2005_update_pen_state(struct tsc2005 *ts,
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)
{
struct tsc2005 *ts = _ts;
Expand Down Expand Up @@ -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_PRESSURE, 0, max_p, fudge_p, 0);

error = request_threaded_irq(spi->irq,
tsc2005_irq_handler, tsc2005_irq_thread,
error = request_threaded_irq(spi->irq, NULL, tsc2005_irq_thread,
IRQF_TRIGGER_RISING, "tsc2005", ts);
if (error) {
dev_err(&spi->dev, "Failed to request irq, err: %d\n", error);
Expand Down

0 comments on commit dacb650

Please sign in to comment.