diff options
| author |   Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2019-03-03 23:14:44 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2019-03-03 23:14:44 -0800 |
| commit | 65e91e2845b5b8965f21a856e1e0ad70c6522ce7 (patch) | |
| tree | 61b1c7e22270297690f02e0c169e917a27304aef /drivers/input/keyboard/qt2160.c | |
| parent | Input: elan_i2c - add ACPI ID for touchpad in Lenovo V330-15ISK (diff) | |
| parent | Input: ti_am335x_tsc - remove set but not used variable 'tscadc_dev' (diff) | |
| download | linux-dev-65e91e2845b5b8965f21a856e1e0ad70c6522ce7.tar.xz linux-dev-65e91e2845b5b8965f21a856e1e0ad70c6522ce7.zip | |
Merge branch 'next' into for-linus
Prepare input updates for 5.1 merge window.
Diffstat (limited to 'drivers/input/keyboard/qt2160.c')
| -rw-r--r-- | drivers/input/keyboard/qt2160.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/input/keyboard/qt2160.c b/drivers/input/keyboard/qt2160.c index d466bc07aebb..6a43895b28e7 100644 --- a/drivers/input/keyboard/qt2160.c +++ b/drivers/input/keyboard/qt2160.c @@ -68,7 +68,6 @@ struct qt2160_data { struct i2c_client *client; struct input_dev *input; struct delayed_work dwork; - spinlock_t lock; /* Protects canceling/rescheduling of dwork */ unsigned short keycodes[ARRAY_SIZE(qt2160_key2code)]; u16 key_matrix; #ifdef CONFIG_LEDS_CLASS @@ -212,22 +211,15 @@ static int qt2160_get_key_matrix(struct qt2160_data *qt2160) static irqreturn_t qt2160_irq(int irq, void *_qt2160) { struct qt2160_data *qt2160 = _qt2160; - unsigned long flags; - - spin_lock_irqsave(&qt2160->lock, flags); mod_delayed_work(system_wq, &qt2160->dwork, 0); - spin_unlock_irqrestore(&qt2160->lock, flags); - return IRQ_HANDLED; } static void qt2160_schedule_read(struct qt2160_data *qt2160) { - spin_lock_irq(&qt2160->lock); schedule_delayed_work(&qt2160->dwork, QT2160_CYCLE_INTERVAL); - spin_unlock_irq(&qt2160->lock); } static void qt2160_worker(struct work_struct *work) @@ -391,7 +383,6 @@ static int qt2160_probe(struct i2c_client *client, qt2160->client = client; qt2160->input = input; INIT_DELAYED_WORK(&qt2160->dwork, qt2160_worker); - spin_lock_init(&qt2160->lock); input->name = "AT42QT2160 Touch Sense Keyboard"; input->id.bustype = BUS_I2C; |