diff options
| author | Mark Hounschell <markh@compro.net> | 2014-03-11 10:11:43 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-03-17 14:33:35 -0700 |
| commit | 211568d0009fa12f20d19b9ba756469ad35c3948 (patch) | |
| tree | 3dc5eb564e3fb93179ac41ff54c4f05334a29e00 /drivers/staging/dgap | |
| parent | 339db3a32b457c7fc7cc69d8cb653fd4d15000ed (diff) | |
| download | linux-stable-211568d0009fa12f20d19b9ba756469ad35c3948.tar.gz linux-stable-211568d0009fa12f20d19b9ba756469ad35c3948.tar.bz2 linux-stable-211568d0009fa12f20d19b9ba756469ad35c3948.zip | |
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>
Diffstat (limited to 'drivers/staging/dgap')
| -rw-r--r-- | drivers/staging/dgap/dgap.c | 4 | ||||
| -rw-r--r-- | 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 8580ddc5bde6..f9adcbba62cb 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 feeea7cff032..caa1492900a7 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) |