forked from Minki/linux
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: Dmitry Torokhov <dmitry.torokhov@gmail.com> Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com> Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
This commit is contained in:
parent
aaac082dac
commit
85ae911331
@ -743,18 +743,12 @@ static int i2c_hid_open(struct hid_device *hid)
|
||||
struct i2c_hid *ihid = i2c_get_clientdata(client);
|
||||
int ret = 0;
|
||||
|
||||
mutex_lock(&i2c_hid_open_mut);
|
||||
if (!hid->open++) {
|
||||
ret = pm_runtime_get_sync(&client->dev);
|
||||
if (ret < 0) {
|
||||
hid->open--;
|
||||
goto done;
|
||||
}
|
||||
set_bit(I2C_HID_STARTED, &ihid->flags);
|
||||
}
|
||||
done:
|
||||
mutex_unlock(&i2c_hid_open_mut);
|
||||
return ret < 0 ? ret : 0;
|
||||
ret = pm_runtime_get_sync(&client->dev);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
set_bit(I2C_HID_STARTED, &ihid->flags);
|
||||
return 0;
|
||||
}
|
||||
|
||||
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_hid *ihid = i2c_get_clientdata(client);
|
||||
|
||||
/* protecting hid->open to make sure we don't restart
|
||||
* 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);
|
||||
clear_bit(I2C_HID_STARTED, &ihid->flags);
|
||||
|
||||
/* Save some power */
|
||||
pm_runtime_put(&client->dev);
|
||||
}
|
||||
mutex_unlock(&i2c_hid_open_mut);
|
||||
/* Save some power */
|
||||
pm_runtime_put(&client->dev);
|
||||
}
|
||||
|
||||
static int i2c_hid_power(struct hid_device *hid, int lvl)
|
||||
|
Loading…
Reference in New Issue
Block a user