]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
staging: dgap: remove unnecessary dgap_global_lock
authorMark Hounschell <markh@compro.net>
Tue, 4 Mar 2014 21:03:08 +0000 (16:03 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 6 Mar 2014 22:14:37 +0000 (14:14 -0800)
dgap_global_lock is no longer required. This patch
removes it.

Signed-off-by: Mark Hounschell <markh@compro.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/dgap/dgap.c

index 85f85eb166e1f428068ef42f2fb13e11bdbc9a12..c53bdb594f9749eb907af8540c237f9a850418cc 100644 (file)
@@ -240,7 +240,6 @@ static const struct file_operations DgapBoardFops = {
  */
 static uint dgap_NumBoards;
 static struct board_t *dgap_Board[MAXBOARDS];
-DEFINE_SPINLOCK(dgap_global_lock);
 static ulong dgap_poll_counter;
 static char *dgap_config_buf;
 static int dgap_driver_state = DRIVER_INITIALIZED;
@@ -1264,10 +1263,6 @@ static int dgap_ms_sleep(ulong ms)
  */
 static int dgap_tty_preinit(void)
 {
-       unsigned long flags;
-
-       DGAP_LOCK(dgap_global_lock, flags);
-
        /*
         * Allocate a buffer for doing the copy from user space to
         * kernel space in dgap_input().  We only use one buffer and
@@ -1276,12 +1271,9 @@ static int dgap_tty_preinit(void)
         */
        dgap_TmpWriteBuf = kmalloc(WRITEBUFLEN, GFP_ATOMIC);
 
-       if (!dgap_TmpWriteBuf) {
-               DGAP_UNLOCK(dgap_global_lock, flags);
+       if (!dgap_TmpWriteBuf)
                return -ENOMEM;
-       }
 
-       DGAP_UNLOCK(dgap_global_lock, flags);
        return 0;
 }