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>

diff --git a/drivers/staging/dgap/dgap.c b/drivers/staging/dgap/dgap.c
index 8580ddc5bde6ce8660752f74cb117a51b825e599..f9adcbba62cbdb2d85d1a0da821a656eddf64d5e 100644 (file)
--- 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 feeea7cff032d08c92a4fb18a8aef4a80722730b..caa1492900a7d7ccfb71dbc7a41914058f58673b 100644 (file)
--- 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)