1 files changed, 12 insertions, 12 deletions

diff --git a/drivers/tty/tty_ldisc.c b/drivers/tty/tty_ldisc.c
index 1c4d7b6d8a76..5bdc241628ac 100644
--- a/drivers/tty/tty_ldisc.c
+++ b/drivers/tty/tty_ldisc.c
@@ -308,19 +308,19 @@ EXPORT_SYMBOL_GPL(tty_ldisc_deref);
 
 
 static inline int __lockfunc
-tty_ldisc_lock(struct tty_struct *tty, unsigned long timeout)
+__tty_ldisc_lock(struct tty_struct *tty, unsigned long timeout)
 {
         return ldsem_down_write(&tty->ldisc_sem, timeout);
 }
 
 static inline int __lockfunc
-tty_ldisc_lock_nested(struct tty_struct *tty, unsigned long timeout)
+__tty_ldisc_lock_nested(struct tty_struct *tty, unsigned long timeout)
 {
         return ldsem_down_write_nested(&tty->ldisc_sem,
                                        LDISC_SEM_OTHER, timeout);
 }
 
-static inline void tty_ldisc_unlock(struct tty_struct *tty)
+static inline void __tty_ldisc_unlock(struct tty_struct *tty)
 {
         return ldsem_up_write(&tty->ldisc_sem);
 }
@@ -332,24 +332,24 @@ tty_ldisc_lock_pair_timeout(struct tty_struct *tty, struct tty_struct *tty2,
         int ret;
 
         if (tty < tty2) {
-                ret = tty_ldisc_lock(tty, timeout);
+                ret = __tty_ldisc_lock(tty, timeout);
                 if (ret) {
-                        ret = tty_ldisc_lock_nested(tty2, timeout);
+                        ret = __tty_ldisc_lock_nested(tty2, timeout);
                         if (!ret)
-                                tty_ldisc_unlock(tty);
+                                __tty_ldisc_unlock(tty);
                 }
         } else {
                 /* if this is possible, it has lots of implications */
                 WARN_ON_ONCE(tty == tty2);
                 if (tty2 && tty != tty2) {
-                        ret = tty_ldisc_lock(tty2, timeout);
+                        ret = __tty_ldisc_lock(tty2, timeout);
                         if (ret) {
-                                ret = tty_ldisc_lock_nested(tty, timeout);
+                                ret = __tty_ldisc_lock_nested(tty, timeout);
                                 if (!ret)
-                                        tty_ldisc_unlock(tty2);
+                                        __tty_ldisc_unlock(tty2);
                         }
                 } else
-                        ret = tty_ldisc_lock(tty, timeout);
+                        ret = __tty_ldisc_lock(tty, timeout);
         }
 
         if (!ret)
@@ -370,9 +370,9 @@ tty_ldisc_lock_pair(struct tty_struct *tty, struct tty_struct *tty2)
 static void __lockfunc tty_ldisc_unlock_pair(struct tty_struct *tty,
                                              struct tty_struct *tty2)
 {
-        tty_ldisc_unlock(tty);
+        __tty_ldisc_unlock(tty);
         if (tty2)
-                tty_ldisc_unlock(tty2);
+                __tty_ldisc_unlock(tty2);
 }
 
 static void __lockfunc tty_ldisc_enable_pair(struct tty_struct *tty,