From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932986AbZKFWoy (ORCPT ); Fri, 6 Nov 2009 17:44:54 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932392AbZKFWlo (ORCPT ); Fri, 6 Nov 2009 17:41:44 -0500 Received: from www.tglx.de ([62.245.132.106]:53976 "EHLO www.tglx.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933139AbZKFWlm (ORCPT ); Fri, 6 Nov 2009 17:41:42 -0500 Message-Id: <20091106223806.641098564@linutronix.de> User-Agent: quilt/0.47-1 Date: Fri, 06 Nov 2009 22:41:29 -0000 From: Thomas Gleixner To: LKML Cc: Ingo Molnar , Peter Zijlstra , Takashi Iwai Subject: [patch 06/16] sound: Replace old style lock initializer References: <20091106223547.784916750@linutronix.de> Content-Disposition: inline; filename=sound-oss-replace-old-style-lock-init.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org SPIN_LOCK_UNLOCKED is deprecated. Use __SPIN_LOCK_UNLOCKED instead. Signed-off-by: Thomas Gleixner Cc: Takashi Iwai --- 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) {