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/xpp/xpp_usb.c | |
| 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/xpp/xpp_usb.c')
| -rw-r--r-- | drivers/dahdi/xpp/xpp_usb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/dahdi/xpp/xpp_usb.c b/drivers/dahdi/xpp/xpp_usb.c index edc499b..7f370ee 100644 --- a/drivers/dahdi/xpp/xpp_usb.c +++ b/drivers/dahdi/xpp/xpp_usb.c @@ -248,7 +248,7 @@ static unsigned bus_count = 0; /* prevent races between open() and disconnect() */ -static DECLARE_MUTEX (disconnect_sem); +static DEFINE_SEMAPHORE(disconnect_sem); /* * AsteriskNow kernel has backported the "lean" callback from 2.6.20 @@ -690,7 +690,7 @@ static int xusb_probe(struct usb_interface *interface, const struct usb_device_i retval = -ENOMEM; goto probe_failed; } - init_MUTEX (&xusb->sem); + sema_init(&xusb->sem, 1); atomic_set(&xusb->pending_writes, 0); atomic_set(&xusb->pending_reads, 0); atomic_set(&xusb->pcm_tx_drops, 0); |