diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-15 14:51:57 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-15 14:51:57 -0800 |
| commit | 3b3ef30833cc85982b0b7e950998d86f5e2d28cf (patch) | |
| tree | 0abbb1ec81a14f0f718abc01ac908bbe783f7bf9 /include | |
| parent | 9fc819172aa565c7be51f758b7e85301c9df7c70 (diff) | |
| parent | c332e9fcc5289698350d39d4d22c3ed5257d7a80 (diff) | |
| download | linux-3.10-3b3ef30833cc85982b0b7e950998d86f5e2d28cf.tar.gz linux-3.10-3b3ef30833cc85982b0b7e950998d86f5e2d28cf.tar.bz2 linux-3.10-3b3ef30833cc85982b0b7e950998d86f5e2d28cf.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: sentelic - fix left/right horizontal scroll mapping
Input: pmouse - move Sentelic probe down the list
Input: add compat support for sysfs and /proc capabilities output
Input: i8042 - add Dritek quirk for Acer Aspire 5610.
Input: xbox - do not use GFP_KERNEL under spinlock
Input: psmouse - fix Synaptics detection when protocol is disabled
Input: bcm5974 - report ABS_MT events
Input: davinci_keyscan - add device_enable method to platform data
Input: evdev - be less aggressive about sending SIGIO notifies
Input: atkbd - fix canceling event_work in disconnect
Input: serio - fix potential deadlock when unbinding drivers
Input: gf2k - fix &&/|| confusion in gf2k_connect()
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/serio.h | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/include/linux/serio.h b/include/linux/serio.h index e2f3044d4a4..813d26c247e 100644 --- a/include/linux/serio.h +++ b/include/linux/serio.h @@ -136,25 +136,6 @@ static inline void serio_continue_rx(struct serio *serio) spin_unlock_irq(&serio->lock); } -/* - * Use the following functions to pin serio's driver in process context - */ -static inline int serio_pin_driver(struct serio *serio) -{ - return mutex_lock_interruptible(&serio->drv_mutex); -} - -static inline void serio_pin_driver_uninterruptible(struct serio *serio) -{ - mutex_lock(&serio->drv_mutex); -} - -static inline void serio_unpin_driver(struct serio *serio) -{ - mutex_unlock(&serio->drv_mutex); -} - - #endif /* |