Input: qt2160 - remove redundant spinlock
Subsystems (2)
PATCH 1/1 Input: qt2160 - remove redundant spinlock
From: Sven Van Asbroeck <[email protected]>
Remove a spinlock which prevents schedule_delayed_work() and mod_delayed_work() from executing concurrently.
This was required back when mod_delayed_work() did not exist, and had to be implemented with a cancel + schedule. See commit e7c2f967445d ("workqueue: use mod_delayed_work() instead of __cancel + queue")
schedule_delayed_work() and mod_delayed_work() can now be used concurrently. So the spinlock is no longer needed.
--- drivers/input/keyboard/qt2160.c | 9 --------- 1 file changed, 9 deletions(-)
drivers/input/keyboard/qt2160.c +0 -9
@@ -69,7 +69,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
@@ -221,22 +220,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)
@@ -406,7 +398,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 ;
Signature · 1 line
2.17.1
Quoted 10 lines · On Sun, Feb 10, 2019 at 09:32:22PM -0500, [email protected] wrote:
From: Sven Van Asbroeck <[email protected]>
Remove a spinlock which prevents
schedule_delayed_work()andmod_delayed_work()from executing concurrently.This was required back when
mod_delayed_work()did not exist, and had to be implemented with a cancel + schedule. See commite7c2f967445d("workqueue: usemod_delayed_work()instead of__cancel+ queue")
Quoted 5 lines
schedule_delayed_work()andmod_delayed_work()can now be used concurrently. So the spinlock is no longer needed.Cc Tejun Heo <[email protected]>Signed-off-by Sven Van Asbroeck <[email protected]>
Applied, thank you.
Quoted 50 lines
--- drivers/input/keyboard/qt2160.c | 9 --------- 1 file changed, 9 deletions(-)drivers/input/keyboard/qt2160.c +0
-9@@ -69,7 +69,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 @@ -221,22 +220,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)@@ -406,7 +398,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 ;Signature · 1 line
2.17.1
Signature · 1 line
Dmitry