Commit 85ae9113 authored by Dmitry Torokhov's avatar Dmitry Torokhov Committed by Jiri Kosina

HID: i2c-hid: remove custom locking from i2c_hid_open/close

Now that HID core enforces serialization of transport driver open/close
calls we can remove custom locking from i2c-hid driver.
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
Reviewed-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Reviewed-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent aaac082d
...@@ -743,18 +743,12 @@ static int i2c_hid_open(struct hid_device *hid) ...@@ -743,18 +743,12 @@ static int i2c_hid_open(struct hid_device *hid)
struct i2c_hid *ihid = i2c_get_clientdata(client); struct i2c_hid *ihid = i2c_get_clientdata(client);
int ret = 0; int ret = 0;
mutex_lock(&i2c_hid_open_mut); ret = pm_runtime_get_sync(&client->dev);
if (!hid->open++) { if (ret < 0)
ret = pm_runtime_get_sync(&client->dev); return ret;
if (ret < 0) {
hid->open--; set_bit(I2C_HID_STARTED, &ihid->flags);
goto done; return 0;
}
set_bit(I2C_HID_STARTED, &ihid->flags);
}
done:
mutex_unlock(&i2c_hid_open_mut);
return ret < 0 ? ret : 0;
} }
static void i2c_hid_close(struct hid_device *hid) static void i2c_hid_close(struct hid_device *hid)
...@@ -762,18 +756,10 @@ static void i2c_hid_close(struct hid_device *hid) ...@@ -762,18 +756,10 @@ static void i2c_hid_close(struct hid_device *hid)
struct i2c_client *client = hid->driver_data; struct i2c_client *client = hid->driver_data;
struct i2c_hid *ihid = i2c_get_clientdata(client); struct i2c_hid *ihid = i2c_get_clientdata(client);
/* protecting hid->open to make sure we don't restart clear_bit(I2C_HID_STARTED, &ihid->flags);
* data acquistion due to a resumption we no longer
* care about
*/
mutex_lock(&i2c_hid_open_mut);
if (!--hid->open) {
clear_bit(I2C_HID_STARTED, &ihid->flags);
/* Save some power */ /* Save some power */
pm_runtime_put(&client->dev); pm_runtime_put(&client->dev);
}
mutex_unlock(&i2c_hid_open_mut);
} }
static int i2c_hid_power(struct hid_device *hid, int lvl) static int i2c_hid_power(struct hid_device *hid, int lvl)
......
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