From patchwork Mon Feb 17 16:51:36 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charles Keepax X-Patchwork-Id: 3664241 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id C16859F1EE for ; Mon, 17 Feb 2014 17:07:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EE71720131 for ; Mon, 17 Feb 2014 17:07:37 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id B93E320200 for ; Mon, 17 Feb 2014 17:07:36 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id D61C826513D; Mon, 17 Feb 2014 18:07:35 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=1.0 required=5.0 tests=BAYES_00,KHOP_BIG_TO_CC, UNPARSEABLE_RELAY autolearn=no version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id 340862652B9; Mon, 17 Feb 2014 18:02:46 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 69FAB265038; Mon, 17 Feb 2014 18:02:41 +0100 (CET) Received: from opensource.wolfsonmicro.com (opensource.wolfsonmicro.com [80.75.67.52]) by alsa0.perex.cz (Postfix) with ESMTP id 440C6265012 for ; Mon, 17 Feb 2014 18:00:11 +0100 (CET) Received: from localhost.localdomain (unknown [87.246.78.26]) by opensource.wolfsonmicro.com (Postfix) with ESMTPSA id 4AB04110F90; Mon, 17 Feb 2014 17:00:08 +0000 (GMT) From: Charles Keepax To: broonie@kernel.org Date: Mon, 17 Feb 2014 16:51:36 +0000 Message-Id: <1392655903-24537-9-git-send-email-ckeepax@opensource.wolfsonmicro.com> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1392655903-24537-1-git-send-email-ckeepax@opensource.wolfsonmicro.com> References: <1392655903-24537-1-git-send-email-ckeepax@opensource.wolfsonmicro.com> Cc: alsa-devel@alsa-project.org, lars@metafoo.de, eric.y.miao@gmail.com, dmitry.torokhov@gmail.com, lgirdwood@gmail.com, haojian.zhuang@gmail.com, linux-kernel@vger.kernel.org, peter.ujfalusi@ti.com, cw00.choi@samsung.com, myungjoo.ham@samsung.com, patches@opensource.wolfsonmicro.com, linux@arm.linux.org.uk, jarkko.nikula@bitmer.com Subject: [alsa-devel] [PATCH 08/15] ASoC: mfld_machine: Update locking around use of DAPM pin API X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Spam-Level: * X-Virus-Scanned: ClamAV using ClamSMTP The pin updates in this driver look like they are intended to be done atomically, update to do so. Signed-off-by: Charles Keepax --- sound/soc/intel/mfld_machine.c | 43 +++++++++++++++++++++++++++------------- 1 files changed, 29 insertions(+), 14 deletions(-) diff --git a/sound/soc/intel/mfld_machine.c b/sound/soc/intel/mfld_machine.c index d3d4c32..4b60542 100644 --- a/sound/soc/intel/mfld_machine.c +++ b/sound/soc/intel/mfld_machine.c @@ -105,15 +105,20 @@ static int headset_set_switch(struct snd_kcontrol *kcontrol, if (ucontrol->value.integer.value[0] == hs_switch) return 0; + mutex_lock(&codec->dapm.card->dapm_mutex); + if (ucontrol->value.integer.value[0]) { pr_debug("hs_set HS path\n"); - snd_soc_dapm_enable_pin(&codec->dapm, "Headphones"); - snd_soc_dapm_disable_pin(&codec->dapm, "EPOUT"); + snd_soc_dapm_enable_pin_locked(&codec->dapm, "Headphones"); + snd_soc_dapm_disable_pin_locked(&codec->dapm, "EPOUT"); } else { pr_debug("hs_set EP path\n"); - snd_soc_dapm_disable_pin(&codec->dapm, "Headphones"); - snd_soc_dapm_enable_pin(&codec->dapm, "EPOUT"); + snd_soc_dapm_disable_pin_locked(&codec->dapm, "Headphones"); + snd_soc_dapm_enable_pin_locked(&codec->dapm, "EPOUT"); } + + mutex_unlock(&codec->dapm.card->dapm_mutex); + snd_soc_dapm_sync(&codec->dapm); hs_switch = ucontrol->value.integer.value[0]; @@ -122,19 +127,23 @@ static int headset_set_switch(struct snd_kcontrol *kcontrol, static void lo_enable_out_pins(struct snd_soc_codec *codec) { - snd_soc_dapm_enable_pin(&codec->dapm, "IHFOUTL"); - snd_soc_dapm_enable_pin(&codec->dapm, "IHFOUTR"); - snd_soc_dapm_enable_pin(&codec->dapm, "LINEOUTL"); - snd_soc_dapm_enable_pin(&codec->dapm, "LINEOUTR"); - snd_soc_dapm_enable_pin(&codec->dapm, "VIB1OUT"); - snd_soc_dapm_enable_pin(&codec->dapm, "VIB2OUT"); + mutex_lock(&codec->dapm.card->dapm_mutex); + + snd_soc_dapm_enable_pin_locked(&codec->dapm, "IHFOUTL"); + snd_soc_dapm_enable_pin_locked(&codec->dapm, "IHFOUTR"); + snd_soc_dapm_enable_pin_locked(&codec->dapm, "LINEOUTL"); + snd_soc_dapm_enable_pin_locked(&codec->dapm, "LINEOUTR"); + snd_soc_dapm_enable_pin_locked(&codec->dapm, "VIB1OUT"); + snd_soc_dapm_enable_pin_locked(&codec->dapm, "VIB2OUT"); if (hs_switch) { - snd_soc_dapm_enable_pin(&codec->dapm, "Headphones"); - snd_soc_dapm_disable_pin(&codec->dapm, "EPOUT"); + snd_soc_dapm_enable_pin_locked(&codec->dapm, "Headphones"); + snd_soc_dapm_disable_pin_locked(&codec->dapm, "EPOUT"); } else { - snd_soc_dapm_disable_pin(&codec->dapm, "Headphones"); - snd_soc_dapm_enable_pin(&codec->dapm, "EPOUT"); + snd_soc_dapm_disable_pin_locked(&codec->dapm, "Headphones"); + snd_soc_dapm_enable_pin_locked(&codec->dapm, "EPOUT"); } + + mutex_unlock(&codec->dapm.card->dapm_mutex); } static int lo_get_switch(struct snd_kcontrol *kcontrol, @@ -156,6 +165,9 @@ static int lo_set_switch(struct snd_kcontrol *kcontrol, * pins and then disable pins not required */ lo_enable_out_pins(codec); + + mutex_lock(&codec->dapm.card->dapm_mutex); + switch (ucontrol->value.integer.value[0]) { case 0: pr_debug("set vibra path\n"); @@ -185,6 +197,9 @@ static int lo_set_switch(struct snd_kcontrol *kcontrol, snd_soc_update_bits(codec, SN95031_LOCTL, 0x66, 0x66); break; } + + mutex_unlock(&codec->dapm.card->dapm_mutex); + snd_soc_dapm_sync(&codec->dapm); lo_dac = ucontrol->value.integer.value[0]; return 0;