提交 d9d2401f 编写于 作者: D Dmitry Torokhov 提交者: Jiri Kosina

greybus: hid: remove custom locking from gb_hid_open/close

Now that HID core enforces serialization of transport driver open/close
calls we can remove custom locking from greybus hid driver.
Signed-off-by: NDmitry Torokhov <dmitry.torokhov@gmail.com>
Acked-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: NViresh Kumar <viresh.kumar@linaro.org>
Reviewed-by: NAndy Shevchenko <andy.shevchenko@gmail.com>
Reviewed-by: NBenjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: NJiri Kosina <jkosina@suse.cz>
上级 e399396a
...@@ -32,8 +32,6 @@ struct gb_hid { ...@@ -32,8 +32,6 @@ struct gb_hid {
char *inbuf; char *inbuf;
}; };
static DEFINE_MUTEX(gb_hid_open_mutex);
/* Routines to get controller's information over greybus */ /* Routines to get controller's information over greybus */
/* Operations performed on greybus */ /* Operations performed on greybus */
...@@ -346,19 +344,14 @@ static void gb_hid_stop(struct hid_device *hid) ...@@ -346,19 +344,14 @@ static void gb_hid_stop(struct hid_device *hid)
static int gb_hid_open(struct hid_device *hid) static int gb_hid_open(struct hid_device *hid)
{ {
struct gb_hid *ghid = hid->driver_data; struct gb_hid *ghid = hid->driver_data;
int ret = 0; int ret;
mutex_lock(&gb_hid_open_mutex);
if (!hid->open++) {
ret = gb_hid_set_power(ghid, GB_HID_TYPE_PWR_ON);
if (ret < 0)
hid->open--;
else
set_bit(GB_HID_STARTED, &ghid->flags);
}
mutex_unlock(&gb_hid_open_mutex);
return ret; ret = gb_hid_set_power(ghid, GB_HID_TYPE_PWR_ON);
if (ret < 0)
return ret;
set_bit(GB_HID_STARTED, &ghid->flags);
return 0;
} }
static void gb_hid_close(struct hid_device *hid) static void gb_hid_close(struct hid_device *hid)
...@@ -366,21 +359,13 @@ static void gb_hid_close(struct hid_device *hid) ...@@ -366,21 +359,13 @@ static void gb_hid_close(struct hid_device *hid)
struct gb_hid *ghid = hid->driver_data; struct gb_hid *ghid = hid->driver_data;
int ret; int ret;
/* clear_bit(GB_HID_STARTED, &ghid->flags);
* Protecting hid->open to make sure we don't restart data acquistion
* due to a resumption we no longer care about.. /* Save some power */
*/ ret = gb_hid_set_power(ghid, GB_HID_TYPE_PWR_OFF);
mutex_lock(&gb_hid_open_mutex); if (ret)
if (!--hid->open) { dev_err(&ghid->connection->bundle->dev,
clear_bit(GB_HID_STARTED, &ghid->flags); "failed to power off (%d)\n", ret);
/* Save some power */
ret = gb_hid_set_power(ghid, GB_HID_TYPE_PWR_OFF);
if (ret)
dev_err(&ghid->connection->bundle->dev,
"failed to power off (%d)\n", ret);
}
mutex_unlock(&gb_hid_open_mutex);
} }
static int gb_hid_power(struct hid_device *hid, int lvl) static int gb_hid_power(struct hid_device *hid, int lvl)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册