[PATCH 02/06] staging: dgap: remove unnecessary dgap_global_lock

Mark Hounschell markh at compro.net
Tue Mar 4 21:03:08 UTC 2014


dgap_global_lock is no longer required. This patch
removes it.

Signed-off-by: Mark Hounschell <markh at compro.net>
Cc: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
---
 drivers/staging/dgap/dgap.c | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/drivers/staging/dgap/dgap.c b/drivers/staging/dgap/dgap.c
index 85f85eb..c53bdb5 100644
--- a/drivers/staging/dgap/dgap.c
+++ b/drivers/staging/dgap/dgap.c
@@ -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;
 }
 
-- 
1.8.1.4



More information about the devel mailing list