diff options
Diffstat (limited to 'drivers/input')
| -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 43b86482dda0..23dc7c0c7d78 100644 --- a/drivers/input/keyboard/qt2160.c +++ b/drivers/input/keyboard/qt2160.c | |||
| @@ -69,7 +69,6 @@ struct qt2160_data { | |||
| 69 | struct i2c_client *client; | 69 | struct i2c_client *client; |
| 70 | struct input_dev *input; | 70 | struct input_dev *input; |
| 71 | struct delayed_work dwork; | 71 | struct delayed_work dwork; |
| 72 | spinlock_t lock; /* Protects canceling/rescheduling of dwork */ | ||
| 73 | unsigned short keycodes[ARRAY_SIZE(qt2160_key2code)]; | 72 | unsigned short keycodes[ARRAY_SIZE(qt2160_key2code)]; |
| 74 | u16 key_matrix; | 73 | u16 key_matrix; |
| 75 | #ifdef CONFIG_LEDS_CLASS | 74 | #ifdef CONFIG_LEDS_CLASS |
| @@ -221,22 +220,15 @@ static int qt2160_get_key_matrix(struct qt2160_data *qt2160) | |||
| 221 | static irqreturn_t qt2160_irq(int irq, void *_qt2160) | 220 | static irqreturn_t qt2160_irq(int irq, void *_qt2160) |
| 222 | { | 221 | { |
| 223 | struct qt2160_data *qt2160 = _qt2160; | 222 | struct qt2160_data *qt2160 = _qt2160; |
| 224 | unsigned long flags; | ||
| 225 | |||
| 226 | spin_lock_irqsave(&qt2160->lock, flags); | ||
| 227 | 223 | ||
| 228 | mod_delayed_work(system_wq, &qt2160->dwork, 0); | 224 | mod_delayed_work(system_wq, &qt2160->dwork, 0); |
| 229 | 225 | ||
| 230 | spin_unlock_irqrestore(&qt2160->lock, flags); | ||
| 231 | |||
| 232 | return IRQ_HANDLED; | 226 | return IRQ_HANDLED; |
| 233 | } | 227 | } |
| 234 | 228 | ||
| 235 | static void qt2160_schedule_read(struct qt2160_data *qt2160) | 229 | static void qt2160_schedule_read(struct qt2160_data *qt2160) |
| 236 | { | 230 | { |
| 237 | spin_lock_irq(&qt2160->lock); | ||
| 238 | schedule_delayed_work(&qt2160->dwork, QT2160_CYCLE_INTERVAL); | 231 | schedule_delayed_work(&qt2160->dwork, QT2160_CYCLE_INTERVAL); |
| 239 | spin_unlock_irq(&qt2160->lock); | ||
| 240 | } | 232 | } |
| 241 | 233 | ||
| 242 | static void qt2160_worker(struct work_struct *work) | 234 | static void qt2160_worker(struct work_struct *work) |
| @@ -406,7 +398,6 @@ static int qt2160_probe(struct i2c_client *client, | |||
| 406 | qt2160->client = client; | 398 | qt2160->client = client; |
| 407 | qt2160->input = input; | 399 | qt2160->input = input; |
| 408 | INIT_DELAYED_WORK(&qt2160->dwork, qt2160_worker); | 400 | INIT_DELAYED_WORK(&qt2160->dwork, qt2160_worker); |
| 409 | spin_lock_init(&qt2160->lock); | ||
| 410 | 401 | ||
| 411 | input->name = "AT42QT2160 Touch Sense Keyboard"; | 402 | input->name = "AT42QT2160 Touch Sense Keyboard"; |
| 412 | input->id.bustype = BUS_I2C; | 403 | input->id.bustype = BUS_I2C; |
