[PATCH] Convert OSS aic23 to mutex

[PATCH] Convert OSS aic23 to mutex

[Dirk Behme]

[-- Attachment #1: Type: text/plain, Size: 94 bytes --]


ARM: OMAP: Convert OSS aic23 to mutex.

Signed-off-by: Dirk Behme <dirk.behme_at_gmail.com>


[-- Attachment #2: omap-audio-aic23_mutex_patch.txt --]
[-- Type: text/plain, Size: 510 bytes --]

--- ./sound/oss/omap-audio-aic23.c_orig	2006-04-05 20:02:22.000000000 +0200
+++ ./sound/oss/omap-audio-aic23.c	2006-04-05 20:03:05.000000000 +0200
@@ -243,7 +243,7 @@ static audio_state_t aic23_state = {
         .hw_remove      =  __exit_p(omap_aic23_remove),
         .hw_suspend     = omap_aic23_suspend,
         .hw_resume      = omap_aic23_resume,
-	.sem	    = __SEMAPHORE_INIT(aic23_state.sem, 1),
+	.mutex	    = __MUTEX_INITIALIZER(aic23_state.mutex),
 };
 
 /* This will be defined in the audio.h */


[-- Attachment #3: Type: text/plain, Size: 0 bytes --]

Re: [PATCH] Convert OSS aic23 to mutex

[Paul Mundt]

On Wed, Apr 05, 2006 at 08:10:03PM +0200, Dirk Behme wrote:
> --- ./sound/oss/omap-audio-aic23.c_orig	2006-04-05 20:02:22.000000000 +0200
> +++ ./sound/oss/omap-audio-aic23.c	2006-04-05 20:03:05.000000000 +0200
> @@ -243,7 +243,7 @@ static audio_state_t aic23_state = {
>          .hw_remove      =  __exit_p(omap_aic23_remove),
>          .hw_suspend     = omap_aic23_suspend,
>          .hw_resume      = omap_aic23_resume,
> -	.sem	    = __SEMAPHORE_INIT(aic23_state.sem, 1),
> +	.mutex	    = __MUTEX_INITIALIZER(aic23_state.mutex),
>  };
>  
>  /* This will be defined in the audio.h */
> 
Are you sure this doesn't need an #include <linux/mutex.h>? All of the
other conversions so far have..

Re: [PATCH] Convert OSS aic23 to mutex

[Dirk Behme]

[-- Attachment #1: Type: text/plain, Size: 439 bytes --]

Paul Mundt wrote:
> Are you sure this doesn't need an #include <linux/mutex.h>? All of the
> other conversions so far have..

It compiles without extra linux/mutex.h because
linux/sound.h includes linux/fs.h which includes
linux/mutex.h. But you are right, include linux/mutex.h is
cleaner. Please find updated patch in attachment.

Cheers

Dirk

ARM: OMAP: Convert OSS aic23 to mutex.

Signed-off-by: Dirk Behme <dirk.behme_at_gmail.com>

[-- Attachment #2: omap-audio-aic23_mutex_patch.txt --]
[-- Type: text/plain, Size: 692 bytes --]

--- ./sound/oss/omap-audio-aic23.c_orig	2006-04-05 20:02:22.000000000 +0200
+++ ./sound/oss/omap-audio-aic23.c	2006-04-06 16:23:30.000000000 +0200
@@ -38,6 +38,7 @@
 #include <linux/sound.h>
 #include <linux/soundcard.h>
 #include <linux/clk.h>
+#include <linux/mutex.h>
 
 #include <asm/uaccess.h>
 #include <asm/hardware.h>
@@ -243,7 +244,7 @@ static audio_state_t aic23_state = {
         .hw_remove      =  __exit_p(omap_aic23_remove),
         .hw_suspend     = omap_aic23_suspend,
         .hw_resume      = omap_aic23_resume,
-	.sem	    = __SEMAPHORE_INIT(aic23_state.sem, 1),
+	.mutex	    = __MUTEX_INITIALIZER(aic23_state.mutex),
 };
 
 /* This will be defined in the audio.h */





[-- Attachment #3: Type: text/plain, Size: 0 bytes --]

Re: [PATCH] Convert OSS aic23 to mutex

[tony]

* Dirk Behme <dirk.behme@googlemail.com> [060406 10:32]:
> Paul Mundt wrote:
> >Are you sure this doesn't need an #include <linux/mutex.h>? All of the
> >other conversions so far have..
> 
> It compiles without extra linux/mutex.h because
> linux/sound.h includes linux/fs.h which includes
> linux/mutex.h. But you are right, include linux/mutex.h is
> cleaner. Please find updated patch in attachment.

Thanks, pushing today.

Tony