This patch gets rid of the DGAP_SPINLOCK_INIT macro
Signed-off-by: Mark Hounschell <ma...@compro.net>
Cc: Greg Kroah-Hartman <gre...@linuxfoundation.org>
---
drivers/staging/dgap/dgap.c | 4 ++--
drivers/staging/dgap/dgap.h | 1 -
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/dgap/dgap.c b/drivers/staging/dgap/dgap.c
index bfb52c6..571f82f 100644
--- a/drivers/staging/dgap/dgap.c
+++ b/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;
diff --git a/drivers/staging/dgap/dgap.h b/drivers/staging/dgap/dgap.h
index feeea7c..caa1492 100644
--- a/drivers/staging/dgap/dgap.h
+++ b/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)
--
1.8.1.4
_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
