diff options
| author | Shaun Ruffell <sruffell@digium.com> | 2010-11-04 16:40:29 +0000 |
|---|---|---|
| committer | Shaun Ruffell <sruffell@digium.com> | 2010-11-04 16:40:29 +0000 |
| commit | 1ba3c563270871f6bb7218122468642fbd0299fc (patch) | |
| tree | 3392234b7d277ffb8487b75b569d5772efe690b2 /drivers/dahdi/wctdm24xxp | |
| parent | fc9e73c6795070cc54b7a7f6df63052060145774 (diff) | |
Remove mutex emulation
Using semaphores as mutexes was removed from the kernel in 4882720b267b.
Just use straight semaphores now. 'DECLARE_MUTEX()' -> 'DEFINE_SEMAPHORE()'
and 'init_MUTEX()' -> 'sema_init()'.
Signed-off-by: Shaun Ruffell <sruffell@digium.com>
LKML-Reference: <20100907125057.562399240@linutronix.de>
Acked-by: Tzafrir Cohen <tzafrir.cohen@xorcom.com>
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@9464 a0bf4364-ded3-4de4-8d8a-66a801d63aff
Diffstat (limited to 'drivers/dahdi/wctdm24xxp')
| -rw-r--r-- | drivers/dahdi/wctdm24xxp/base.c | 4 | ||||
| -rw-r--r-- | drivers/dahdi/wctdm24xxp/xhfc.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/dahdi/wctdm24xxp/base.c b/drivers/dahdi/wctdm24xxp/base.c index 4fc2a42..4a287fc 100644 --- a/drivers/dahdi/wctdm24xxp/base.c +++ b/drivers/dahdi/wctdm24xxp/base.c @@ -207,7 +207,7 @@ static inline bool is_hx8(const struct wctdm *wc) } struct wctdm *ifaces[WC_MAX_IFACES]; -DECLARE_MUTEX(ifacelock); +DEFINE_SEMAPHORE(ifacelock); static void wctdm_release(struct wctdm *wc); @@ -4923,7 +4923,7 @@ __wctdm_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) /* This is to insure that the analog span is given lowest priority */ wc->oldsync = -1; - init_MUTEX(&wc->syncsem); + sema_init(&wc->syncsem, 1); INIT_LIST_HEAD(&wc->frame_list); spin_lock_init(&wc->frame_list_lock); diff --git a/drivers/dahdi/wctdm24xxp/xhfc.c b/drivers/dahdi/wctdm24xxp/xhfc.c index 00be877..ee227e0 100644 --- a/drivers/dahdi/wctdm24xxp/xhfc.c +++ b/drivers/dahdi/wctdm24xxp/xhfc.c @@ -2576,8 +2576,8 @@ static int b400m_probe(struct wctdm *wc, int modpos) } spin_lock_init(&b4->reglock); - init_MUTEX(&b4->regsem); - init_MUTEX(&b4->fifosem); + sema_init(&b4->regsem, 1); + sema_init(&b4->fifosem, 1); for (x = 0; x < 4; x++) { fasthdlc_init(&b4->spans[x].rxhdlc, FASTHDLC_MODE_16); |