Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 211568d0 authored by Mark Hounschell's avatar Mark Hounschell Committed by Greg Kroah-Hartman
Browse files

staging: dgap: Replace/remove DGAP_SPINLOCK_INIT macro 



This patch gets rid of the DGAP_SPINLOCK_INIT macro

Signed-off-by: default avatarMark Hounschell <markh@compro.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 339db3a3

drivers/staging/dgap/dgap.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

drivers/staging/dgap/dgap.h

+0 −1
Original line number Diff line number Diff line
@@ -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)