Re: [patch 06/16] sound: Replace old style lock initializer

Takashi Iwai
2009-11-07T09:20:33Z

At Fri, 06 Nov 2009 22:41:29 -0000,
Thomas Gleixner wrote:
>
> SPIN_LOCK_UNLOCKED is deprecated. Use __SPIN_LOCK_UNLOCKED instead.
>
> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
> Cc: Takashi Iwai <tiwai@suse.de>

Applied to sound git tree now. Thanks!

Takashi

> ---
> sound/oss/dmasound/dmasound_core.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> Index: linux-2.6/sound/oss/dmasound/dmasound_core.c
> ===================================================================
> --- linux-2.6.orig/sound/oss/dmasound/dmasound_core.c
> +++ linux-2.6/sound/oss/dmasound/dmasound_core.c
> @@ -219,7 +219,9 @@ static int shared_resources_initialised;
> * Mid level stuff
> */
>
> -struct sound_settings dmasound = { .lock = SPIN_LOCK_UNLOCKED };
> +struct sound_settings dmasound = {
> + .lock = __SPIN_LOCK_UNLOCKED(dmasound.lock)
> +};
>
> static inline void sound_silence(void)
> {
>
>