From patchwork Wed Jul 4 14:42:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 141068 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp886821ljj; Wed, 4 Jul 2018 07:42:36 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfq6pN4eLZHLHn+9I/atjnsJTr3JERsiHRHb26erLWpjTD4Ztib634Zw/mGW7cWXa59EhYB X-Received: by 2002:adf:8895:: with SMTP id f21-v6mr1832028wrf.250.1530715355956; Wed, 04 Jul 2018 07:42:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530715355; cv=none; d=google.com; s=arc-20160816; b=XLZ8XJdXC5GNu1zs++J4bBUl+6eAG4w3cam55YVHo4QUdlzYubTYzgLanGvRUFUjEn dF4TAyq2Upf6ol3hEIsKnxBbDbKkyTS26oaduKZZol+vd2BvtymvB7wHpxS4DA1gn0Zo oeid9JSKtywfcAPANL27owZux1DM/3BTyd+MrCcxILp+KCdqig2ZIG7aU8h6jifVHZ+P 8i2kp6GvhKbxoxm/GwU8Xf9qn3kwwkEyYrr3uawLELCxrDV1npmrqMxTKUuXC4IvNaQy 2XxJN29MWuOmqJXo0+9cZpV69RB6YD72aVt0f9C14aY0VTKjTOCSJ7ip+uscxETLIVz8 wbdw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:date:message-id:in-reply-to:to:from :dkim-signature:delivered-to:arc-authentication-results; bh=8jcApHvKu+r2mmja6Au2NQdhMkADWkVW8SM591zDgIM=; b=0SCzHthFe6INIjsNfZDwBAeUMU+bRfENbZHtrZuJCb/ASCeCRP2yQfx1cA/nR1Q8ib u34zFRdDUWqEPhrMe1ah/Vca86+rhBlZZq+Q/HXOTtbGxPICvRTvvaMlLFfltyZ73wxz ETnP+nJ8DnTdVOMYPkZ8MHiNfr7WO8Dsu2WzAF8DEvi2O3pZaxaqJXt5R7dQzQUEUoJ1 eGd20/peRat1rva1DdEFUv6Gv1w3dF4m70AS6yOPW5MB4U7VSUJrIdCSNtvxUe99E9S7 ENflXITfVDe/OIabaa1dq9ZjXUSWh5GuFpnM0EHmI+uBmrZ5ex5T8PqMbXw+gtoZ5Odq pcUA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=c8u1W6te; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id v7-v6si2904742wri.100.2018.07.04.07.42.35; Wed, 04 Jul 2018 07:42:35 -0700 (PDT) Received-SPF: pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) client-ip=77.48.224.243; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=c8u1W6te; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 4C8FE26779A; Wed, 4 Jul 2018 16:42:20 +0200 (CEST) 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 8320D267791; Wed, 4 Jul 2018 16:42:14 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail1.perex.cz X-Spam-Level: X-Spam-Status: No, score=0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=disabled version=3.4.0 Received: from heliosphere.sirena.org.uk (heliosphere.sirena.org.uk [172.104.155.198]) by alsa0.perex.cz (Postfix) with ESMTP id 85C3826778A for ; Wed, 4 Jul 2018 16:42:12 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sirena.org.uk; s=20170815-heliosphere; h=Date:Message-Id:In-Reply-To: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:References: List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner: List-Archive; bh=wdIkzoNhGIdPPg1EYA7JIxSgpbz3p2K+HaUA4gQBIWM=; b=c8u1W6terAQL uZAj1medCR0v1Z9v9EE4kSLiRn0J19eQkvP4UFbG83n+zn5wPu6Do31d/IcuQTYTCTXqa4/Y1Pk7w DRIYT9ASXtaMCYAImHlS7wnosI0EXAkvMmCIJDv+6AAe5zm5QDP6dUVx3qZAWB46GmvS+ZnTGLaxu kHegk=; Received: from debutante.sirena.org.uk ([2001:470:1f1d:6b5::3] helo=debutante) by heliosphere.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1faiyr-00073p-8e; Wed, 04 Jul 2018 14:42:05 +0000 Received: from broonie by debutante with local (Exim 4.91) (envelope-from ) id 1faiyq-00040h-Qo; Wed, 04 Jul 2018 15:42:04 +0100 From: Mark Brown To: Takashi Iwai In-Reply-To: <20180704140146.6768-5-tiwai@suse.de> Message-Id: Date: Wed, 04 Jul 2018 15:42:04 +0100 Cc: alsa-devel@alsa-project.org, Banajit Goswami , Alexandre Torgue , Patrick Lai , Peter Ujfalusi , Mark Brown , Maxime Coquelin Subject: [alsa-devel] Applied "ASoC: stm32: Use snd_pcm_stop_xrun() helper" to the asoc tree 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 The patch ASoC: stm32: Use snd_pcm_stop_xrun() helper has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From b1625fbb3b87affbedf14545b65d69ff182a0611 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Wed, 4 Jul 2018 16:01:46 +0200 Subject: [PATCH] ASoC: stm32: Use snd_pcm_stop_xrun() helper The XRUN trigger from the driver should be done via snd_pcm_stop_xrun(). It simplifies the locking as well. Signed-off-by: Takashi Iwai Signed-off-by: Mark Brown --- sound/soc/stm/stm32_sai_sub.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) -- 2.18.0.rc2 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/stm/stm32_sai_sub.c b/sound/soc/stm/stm32_sai_sub.c index c4f15ea14197..06fba9650ac4 100644 --- a/sound/soc/stm/stm32_sai_sub.c +++ b/sound/soc/stm/stm32_sai_sub.c @@ -300,11 +300,8 @@ static irqreturn_t stm32_sai_isr(int irq, void *devid) status = SNDRV_PCM_STATE_XRUN; } - if (status != SNDRV_PCM_STATE_RUNNING) { - snd_pcm_stream_lock(sai->substream); - snd_pcm_stop(sai->substream, SNDRV_PCM_STATE_XRUN); - snd_pcm_stream_unlock(sai->substream); - } + if (status != SNDRV_PCM_STATE_RUNNING) + snd_pcm_stop_xrun(sai->substream); return IRQ_HANDLED; }