summaryrefslogtreecommitdiff
path: root/include/linux/hid.h
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2017-09-05 12:08:52 +0300
committerJiri Kosina <jkosina@suse.cz>2017-09-05 12:08:52 +0300
commit2682b892368bf304e7ecddd9ac68045db516a009 (patch)
tree6af4dfef616563906fe34ca66f2ba93a4cca6811 /include/linux/hid.h
parentaaf4f13c456f5fb513d907ede137e8ba77d6adfb (diff)
parent6f68f0ac72087c29a94d1736324902e3ec07a4ec (diff)
downloadlinux-2682b892368bf304e7ecddd9ac68045db516a009.tar.xz
Merge branch 'for-4.14/driver-lock-removal' into for-linus
- Arnd pointed out that driver_lock semaphore is superfluous, as driver core already provides all the necessary concurency protection. Removal patch from Binoy Jayan
Diffstat (limited to 'include/linux/hid.h')
-rw-r--r--include/linux/hid.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/hid.h b/include/linux/hid.h
index 281d1ffcbe02..1774a7887b9a 100644
--- a/include/linux/hid.h
+++ b/include/linux/hid.h
@@ -526,7 +526,6 @@ struct hid_device { /* device report descriptor */
struct hid_report_enum report_enum[HID_REPORT_TYPES];
struct work_struct led_work; /* delayed LED worker */
- struct semaphore driver_lock; /* protects the current driver, except during input */
struct semaphore driver_input_lock; /* protects the current driver */
struct device dev; /* device */
struct hid_driver *driver;
@@ -553,7 +552,7 @@ struct hid_device { /* device report descriptor */
unsigned int status; /* see STAT flags above */
unsigned claimed; /* Claimed by hidinput, hiddev? */
unsigned quirks; /* Various quirks the device can pull on us */
- bool io_started; /* Protected by driver_lock. If IO has started */
+ bool io_started; /* If IO has started */
struct list_head inputs; /* The list of inputs */
void *hiddev; /* The hiddev structure */