diff options
author | Jiri Slaby <jirislaby@gmail.com> | 2008-05-16 05:49:16 -0400 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2008-10-14 17:50:48 -0400 |
commit | c500c9714011edab021591340042787722db9cf0 (patch) | |
tree | d6bb0fe483c9f1c71c3d757e9c13d261ca01cd5f /drivers/hid/hidraw.c | |
parent | 85cdaf524b7ddab627e7d15405693f2511ef7505 (diff) |
HID: hid, make parsing event driven
Next step for complete hid bus, this patch includes:
- call parser either from probe or from hid-core if there is no probe.
- add ll_driver structure and centralize some stuff there (open, close...)
- split and merge usb_hid_configure and hid_probe into several functions
to allow hooks/fixes between them
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/hidraw.c')
-rw-r--r-- | drivers/hid/hidraw.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/hid/hidraw.c b/drivers/hid/hidraw.c index c40f0403edaf..4be240e74d4f 100644 --- a/drivers/hid/hidraw.c +++ b/drivers/hid/hidraw.c | |||
@@ -181,7 +181,7 @@ static int hidraw_open(struct inode *inode, struct file *file) | |||
181 | 181 | ||
182 | dev = hidraw_table[minor]; | 182 | dev = hidraw_table[minor]; |
183 | if (!dev->open++) | 183 | if (!dev->open++) |
184 | dev->hid->hid_open(dev->hid); | 184 | dev->hid->ll_driver->open(dev->hid); |
185 | 185 | ||
186 | out_unlock: | 186 | out_unlock: |
187 | spin_unlock(&minors_lock); | 187 | spin_unlock(&minors_lock); |
@@ -207,7 +207,7 @@ static int hidraw_release(struct inode * inode, struct file * file) | |||
207 | dev = hidraw_table[minor]; | 207 | dev = hidraw_table[minor]; |
208 | if (!dev->open--) { | 208 | if (!dev->open--) { |
209 | if (list->hidraw->exist) | 209 | if (list->hidraw->exist) |
210 | dev->hid->hid_close(dev->hid); | 210 | dev->hid->ll_driver->close(dev->hid); |
211 | else | 211 | else |
212 | kfree(list->hidraw); | 212 | kfree(list->hidraw); |
213 | } | 213 | } |
@@ -367,7 +367,7 @@ void hidraw_disconnect(struct hid_device *hid) | |||
367 | device_destroy(hidraw_class, MKDEV(hidraw_major, hidraw->minor)); | 367 | device_destroy(hidraw_class, MKDEV(hidraw_major, hidraw->minor)); |
368 | 368 | ||
369 | if (hidraw->open) { | 369 | if (hidraw->open) { |
370 | hid->hid_close(hid); | 370 | hid->ll_driver->close(hid); |
371 | wake_up_interruptible(&hidraw->wait); | 371 | wake_up_interruptible(&hidraw->wait); |
372 | } else { | 372 | } else { |
373 | kfree(hidraw); | 373 | kfree(hidraw); |