Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-07 12:41:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

V4L/DVB (5946): Use mutex instead of semaphore in the DVB frontend tuning interface

Browse Source 
The DVB frontend tuning interface uses a semaphore as mutex. Use the
mutex API instead of the (binary) semaphore.

Signed-off-by: Matthias Kaehlcke <matthias.kaehlcke@gmail.com>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
Matthias Kaehlcke 2007-07-30 14:58:10 -03:00 committed by Mauro Carvalho Chehab
parent 667c7bc0af
commit 03b7612336
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/media/dvb/dvb-core/dvb_frontend.c
View File

@ -138,7 +138,7 @@ static void dvb_frontend_add_event(struct dvb_frontend *fe, fe_status_t status)
dprintk ("%s\n", __FUNCTION__);
if (down_interruptible (&events->sem))
if (mutex_lock_interruptible (&events->mtx))
return;
wp = (events->eventw + 1) % MAX_EVENT;
@ -159,7 +159,7 @@ static void dvb_frontend_add_event(struct dvb_frontend *fe, fe_status_t status)
events->eventw = wp;
up (&events->sem);
mutex_unlock(&events->mtx);
e->status = status;
@ -197,7 +197,7 @@ static int dvb_frontend_get_event(struct dvb_frontend *fe,
return ret;
}
if (down_interruptible (&events->sem))
if (mutex_lock_interruptible (&events->mtx))
return -ERESTARTSYS;
memcpy (event, &events->events[events->eventr],
@ -205,7 +205,7 @@ static int dvb_frontend_get_event(struct dvb_frontend *fe,
events->eventr = (events->eventr + 1) % MAX_EVENT;
up (&events->sem);
mutex_unlock(&events->mtx);
return 0;
}
@ -1126,7 +1126,7 @@ int dvb_register_frontend(struct dvb_adapter* dvb,
init_MUTEX (&fepriv->sem);
init_waitqueue_head (&fepriv->wait_queue);
init_waitqueue_head (&fepriv->events.wait_queue);
init_MUTEX (&fepriv->events.sem);
mutex_init(&fepriv->events.mtx);
fe->dvb = dvb;
fepriv->inversion = INVERSION_OFF;

3
drivers/media/dvb/dvb-core/dvb_frontend.h
View File

@ -35,6 +35,7 @@
#include <linux/module.h>
#include <linux/errno.h>
#include <linux/delay.h>
#include <linux/mutex.h>
#include <linux/dvb/frontend.h>
@ -142,7 +143,7 @@ struct dvb_fe_events {
int eventr;
int overflow;
wait_queue_head_t wait_queue;
struct semaphore sem;
struct mutex mtx;
};
struct dvb_frontend {