OMAP: OSS: sem2mutex conversion
PATCH 1/1 OMAP: OSS: sem2mutex conversion
---Komal Shah
http://komalshah.blogspot.com/
__________________________________________________
Do You Yahoo!?
Tired of spam? Yahoo! Mail has the best spam protection around
http://mail.yahoo.com
Subject: [PATCH] OMAP: OSS: sem2mutex conversion
Signed-off-by Komal Shah <[email protected]>
---
sound/oss/omap-audio-tsc2101.c | 4 ++-- sound/oss/omap-audio.c | 12 ++++++------ sound/oss/omap-audio.h | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-)
62f9d1526185a03bcd0defb273d38927cd5ee7b4
sound/oss/omap-audio-tsc2101.c +2 -2
@@ -33,8 +33,8 @@#include <linux/errno.h> #include <linux/sound.h> #include <linux/soundcard.h> +#include <linux/mutex.h> -#include <asm/semaphore.h> #include <asm/uaccess.h> #include <asm/hardware.h> #include <asm/arch/dma.h>
@@ -326,7 +326,7 @@ static audio_state_t tsc2101_state = { .hw_remove = omap_tsc2101_remove, .hw_suspend = omap_tsc2101_suspend, .hw_resume = omap_tsc2101_resume, - .sem = __SEMAPHORE_INIT(tsc2101_state.sem, 1), + .mutex = __MUTEX_INITIALIZER(tsc2101_state.mutex), };/* This will be defined in the Audio.h */
sound/oss/omap-audio.c +6 -6
@@ -46,11 +46,11 @@#include <linux/delay.h> #include <linux/platform_device.h> #include <linux/completion.h> +#include <linux/mutex.h> #include <asm/uaccess.h> #include <asm/io.h> #include <asm/hardware.h> -#include <asm/semaphore.h> #include "omap-audio-dma-intfc.h" #include "omap-audio.h"
@@ -438,7 +438,7 @@ int audio_register_codec(audio_state_t * }memcpy (&audio_state, codec_state,sizeof (audio_state_t)); -sema_init (&audio_state.sem,1 ); +mutex_init (&audio_state.mutex); ret =platform_device_register (&omap_audio_device);if (ret !=0 ) {
@@ -1024,7 +1024,7 @@ static int audio_open(struct inode *inodreturn -ESTALE ; } -down (&state->sem); +mutex_lock (&state->mutex);/* access control */ err = -ENODEV ;
@@ -1092,7 +1092,7 @@ static int audio_open(struct inode *inod err =0 ; out: -up (&state->sem); +mutex_unlock (&state->mutex);if (err) {module_put (state->owner);module_put (THIS_MODULE );
@@ -1114,7 +1114,7 @@ static int audio_release(struct inode *iFN_IN ; -down (&state->sem); +mutex_lock (&state->mutex);if (file->f_mode &FMODE_READ ) {audio_discard_buf (is);
@@ -1145,7 +1145,7 @@ static int audio_release(struct inode *i state->hw_shutdown (state->data); } -up (&state->sem); +mutex_unlock (&state->mutex);module_put (state->owner);module_put (THIS_MODULE );
sound/oss/omap-audio.h +1 -1
@@ -101,7 +101,7 @@ typedef struct {int (*hw_suspend) (void );int (*hw_resume) (void );struct pm_dev *pm_dev; -struct semaphore sem;/* to protect against races in attach() */ +struct mutex mutex;/* to protect against races in attach() */ } audio_state_t;#ifdef AUDIO_PM
Signature · 1 line
1.1.6