Commit 43bcd820 authored by Sven Van Asbroeck's avatar Sven Van Asbroeck Committed by Dmitry Torokhov

Input: synaptics_i2c - remove redundant spinlock

Remove a leftover spinlock.

This was required back when mod_delayed_work() did not exist, and had to
be implemented with a cancel + queue. See commit e7c2f967
("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.
Signed-off-by: default avatarSven Van Asbroeck <TheSven73@gmail.com>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 4e116e93
...@@ -219,7 +219,6 @@ struct synaptics_i2c { ...@@ -219,7 +219,6 @@ struct synaptics_i2c {
struct i2c_client *client; struct i2c_client *client;
struct input_dev *input; struct input_dev *input;
struct delayed_work dwork; struct delayed_work dwork;
spinlock_t lock;
int no_data_count; int no_data_count;
int no_decel_param; int no_decel_param;
int reduce_report_param; int reduce_report_param;
...@@ -369,23 +368,11 @@ static bool synaptics_i2c_get_input(struct synaptics_i2c *touch) ...@@ -369,23 +368,11 @@ static bool synaptics_i2c_get_input(struct synaptics_i2c *touch)
return xy_delta || gesture; return xy_delta || gesture;
} }
static void synaptics_i2c_reschedule_work(struct synaptics_i2c *touch,
unsigned long delay)
{
unsigned long flags;
spin_lock_irqsave(&touch->lock, flags);
mod_delayed_work(system_wq, &touch->dwork, delay);
spin_unlock_irqrestore(&touch->lock, flags);
}
static irqreturn_t synaptics_i2c_irq(int irq, void *dev_id) static irqreturn_t synaptics_i2c_irq(int irq, void *dev_id)
{ {
struct synaptics_i2c *touch = dev_id; struct synaptics_i2c *touch = dev_id;
synaptics_i2c_reschedule_work(touch, 0); mod_delayed_work(system_wq, &touch->dwork, 0);
return IRQ_HANDLED; return IRQ_HANDLED;
} }
...@@ -461,7 +448,7 @@ static void synaptics_i2c_work_handler(struct work_struct *work) ...@@ -461,7 +448,7 @@ static void synaptics_i2c_work_handler(struct work_struct *work)
* We poll the device once in THREAD_IRQ_SLEEP_SECS and * We poll the device once in THREAD_IRQ_SLEEP_SECS and
* if error is detected, we try to reset and reconfigure the touchpad. * if error is detected, we try to reset and reconfigure the touchpad.
*/ */
synaptics_i2c_reschedule_work(touch, delay); mod_delayed_work(system_wq, &touch->dwork, delay);
} }
static int synaptics_i2c_open(struct input_dev *input) static int synaptics_i2c_open(struct input_dev *input)
...@@ -474,7 +461,7 @@ static int synaptics_i2c_open(struct input_dev *input) ...@@ -474,7 +461,7 @@ static int synaptics_i2c_open(struct input_dev *input)
return ret; return ret;
if (polling_req) if (polling_req)
synaptics_i2c_reschedule_work(touch, mod_delayed_work(system_wq, &touch->dwork,
msecs_to_jiffies(NO_DATA_SLEEP_MSECS)); msecs_to_jiffies(NO_DATA_SLEEP_MSECS));
return 0; return 0;
...@@ -530,7 +517,6 @@ static struct synaptics_i2c *synaptics_i2c_touch_create(struct i2c_client *clien ...@@ -530,7 +517,6 @@ static struct synaptics_i2c *synaptics_i2c_touch_create(struct i2c_client *clien
touch->scan_rate_param = scan_rate; touch->scan_rate_param = scan_rate;
set_scan_rate(touch, scan_rate); set_scan_rate(touch, scan_rate);
INIT_DELAYED_WORK(&touch->dwork, synaptics_i2c_work_handler); INIT_DELAYED_WORK(&touch->dwork, synaptics_i2c_work_handler);
spin_lock_init(&touch->lock);
return touch; return touch;
} }
...@@ -637,7 +623,7 @@ static int __maybe_unused synaptics_i2c_resume(struct device *dev) ...@@ -637,7 +623,7 @@ static int __maybe_unused synaptics_i2c_resume(struct device *dev)
if (ret) if (ret)
return ret; return ret;
synaptics_i2c_reschedule_work(touch, mod_delayed_work(system_wq, &touch->dwork,
msecs_to_jiffies(NO_DATA_SLEEP_MSECS)); msecs_to_jiffies(NO_DATA_SLEEP_MSECS));
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment