浏览代码

staging: dgap: Replace/remove DGAP_SPINLOCK_INIT macro

This patch gets rid of the DGAP_SPINLOCK_INIT macro

Signed-off-by: Mark Hounschell <markh@compro.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Mark Hounschell 11 年之前
父节点
当前提交
211568d000
共有 2 个文件被更改,包括 2 次插入3 次删除
  1. 2 2
      drivers/staging/dgap/dgap.c
  2. 0 1
      drivers/staging/dgap/dgap.h

+ 2 - 2
drivers/staging/dgap/dgap.c

@@ -754,7 +754,7 @@ static int dgap_found_board(struct pci_dev *pdev, int id)
 	brd->dpastatus = BD_NOFEP;
 	init_waitqueue_head(&brd->state_wait);
 
-	DGAP_SPINLOCK_INIT(brd->bd_lock);
+	spin_lock_init(&brd->bd_lock);
 
 	brd->state		= BOARD_FOUND;
 	brd->runwait		= 0;
@@ -1422,7 +1422,7 @@ static int dgap_tty_init(struct board_t *brd)
 		if (!brd->channels[i])
 			continue;
 
-		DGAP_SPINLOCK_INIT(ch->ch_lock);
+		spin_lock_init(&ch->ch_lock);
 
 		/* Store all our magic numbers */
 		ch->magic = DGAP_CHANNEL_MAGIC;

+ 0 - 1
drivers/staging/dgap/dgap.h

@@ -198,7 +198,6 @@ typedef unsigned char		uchar;
  * Lock function/defines.
  * Makes spotting lock/unlock locations easier.
  */
-# define DGAP_SPINLOCK_INIT(x)		spin_lock_init(&(x))
 # define DGAP_LOCK(x,y)			spin_lock_irqsave(&(x), y)
 # define DGAP_UNLOCK(x,y)		spin_unlock_irqrestore(&(x), y)