summaryrefslogtreecommitdiff
path: root/include/linux/serio.h
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2010-02-02 08:05:22 (GMT)
committerGrant Likely <grant.likely@secretlab.ca>2010-02-02 08:05:22 (GMT)
commitfb7899b1f0b748ef966071f5dc23c59ebd57d08f (patch)
tree2f13f9d8607871a60334608524e8b4e9447f5309 /include/linux/serio.h
parent212b3c8b8ab94d983c2e0ee1821f17dd5b4e0859 (diff)
parentabe94c756c08d50566c09a65b9c7fe72f83071c5 (diff)
downloadlinux-fsl-qoriq-fb7899b1f0b748ef966071f5dc23c59ebd57d08f.tar.xz
Merge commit 'v2.6.33-rc6' into secretlab/next-spi
Diffstat (limited to 'include/linux/serio.h')
-rw-r--r--include/linux/serio.h19
1 files changed, 0 insertions, 19 deletions
diff --git a/include/linux/serio.h b/include/linux/serio.h
index e2f3044..813d26c 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
/*