From patchwork Wed Jul 4 14:42:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 141070 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp887058ljj; Wed, 4 Jul 2018 07:42:50 -0700 (PDT) X-Google-Smtp-Source: AAOMgpd5Tm7UH21ntoJi9luZMybgQmLBIFQt1vIoldFL4gsko8OmmnJL7Uqs04QsBy44kyU2RMEr X-Received: by 2002:a5d:570a:: with SMTP id a10-v6mr1908993wrv.130.1530715370785; Wed, 04 Jul 2018 07:42:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530715370; cv=none; d=google.com; s=arc-20160816; b=Qn5lZg5y2nrhKwurMfjhLe6Foja1vFXArLtAD92XYnhGtKUnAvWKKBUncUfiIRln6+ wGWk7hfAG8cyrdp8vndMs2sQv13o9VYU92HwUUb9enkihCLuQOaKyCpPQIHjSt9w8h3d xzOGIb6qLGNjqtHrEWT+21VNySxvvEYVXqqwFcHGZXcL3v6QIdSIsOUeVHZluY4755Z1 2xfE4RjDkHSG6rEi8ypY470378mV8hCZxClYBOgD5hKCFmE+IHEAqUzAfvwoLOHuscK9 PvPkxQrJKN2aS/ZEZdI7cILj3YH79bfHz3xyp7IFHSmnMY0c8iIDVeYLrK26GAr9MFlV TEyQ== 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=vPde5sUJepTHp2IPPyXuEu6XiG0Bqj33moze2dflHpY=; b=gG5nDsB4QXxMGr43htQnU+AizL8b8/avTgtFDU+8xGrRpAYQPzU2fiYl24fydbXBo+ yunO4avYNK9docjd+zuHW0ROMh98EeYOWEi7dk3M2Hm/45e+oTyFLuGyTXkkfpRgv2/g 5WmS4RzXFKVrnBtnCLzmynyYEc9NURKejbCo8AbQU3aSI18siLxwaB2U57XSouOaUXPU CCuZ2q4UEniX7g1NN3fQrtOemRMUYhGUSV+VGhHUIJHWvSd0QP5zNOhKMt3fv3tY2Sq7 CGbxNBsBDg21HjYuZY4Sc7SH9cINJkyymN+qZIfxzkXOxmvsbauawxJXp3j7udJTmFvs /LgA== 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=GsZ15Kl1; 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 r2-v6si3239037wrs.318.2018.07.04.07.42.50; Wed, 04 Jul 2018 07:42:50 -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=GsZ15Kl1; 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 44FCD2677B1; Wed, 4 Jul 2018 16:42:25 +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 2B90726779B; Wed, 4 Jul 2018 16:42:18 +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 01FFC267796 for ; Wed, 4 Jul 2018 16:42:14 +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=fPR1bkraqnHEa+O0coCslHkIf+fiMMG6KrxHlUztAyw=; b=GsZ15Kl1jRYC C+w38vOu/Twt1ZIRkDIO5tLt6RwYs5bKycPmxSXwGALhcbuOaOg1QEsF36rU8OcQlZHAYYoGLPEyG QmisiYuofKLz+89OIo22K5g7GK4Nd7eKc3WsqkRK2n/qnUzhFJpVAmG4A0M99WTkYnL8ee5uqUw1v i2fSg=; 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 1faiyx-00074I-Px; Wed, 04 Jul 2018 14:42:11 +0000 Received: from broonie by debutante with local (Exim 4.91) (envelope-from ) id 1faiyx-00043h-B6; Wed, 04 Jul 2018 15:42:11 +0100 From: Mark Brown To: Takashi Iwai In-Reply-To: <20180704140146.6768-2-tiwai@suse.de> Message-Id: Date: Wed, 04 Jul 2018 15:42:11 +0100 Cc: alsa-devel@alsa-project.org, Banajit Goswami , Alexandre Torgue , Patrick Lai , Peter Ujfalusi , Mark Brown , Maxime Coquelin Subject: [alsa-devel] Applied "ASoC: davinci: 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: davinci: 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 dae35d1f4f7dab9ccef20037df91c43e680bad0f Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Wed, 4 Jul 2018 16:01:43 +0200 Subject: [PATCH] ASoC: davinci: Use snd_pcm_stop_xrun() helper Replace open-codes with the standard snd_pcm_stop_xrun() helper. It simplifies codes a lot. Signed-off-by: Takashi Iwai Signed-off-by: Mark Brown --- sound/soc/davinci/davinci-mcasp.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 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/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c index 47c0c821d325..f70db8412c7c 100644 --- a/sound/soc/davinci/davinci-mcasp.c +++ b/sound/soc/davinci/davinci-mcasp.c @@ -320,12 +320,8 @@ static irqreturn_t davinci_mcasp_tx_irq_handler(int irq, void *data) handled_mask |= XUNDRN; substream = mcasp->substreams[SNDRV_PCM_STREAM_PLAYBACK]; - if (substream) { - snd_pcm_stream_lock_irq(substream); - if (snd_pcm_running(substream)) - snd_pcm_stop(substream, SNDRV_PCM_STATE_XRUN); - snd_pcm_stream_unlock_irq(substream); - } + if (substream) + snd_pcm_stop_xrun(substream); } if (!handled_mask) @@ -355,12 +351,8 @@ static irqreturn_t davinci_mcasp_rx_irq_handler(int irq, void *data) handled_mask |= ROVRN; substream = mcasp->substreams[SNDRV_PCM_STREAM_CAPTURE]; - if (substream) { - snd_pcm_stream_lock_irq(substream); - if (snd_pcm_running(substream)) - snd_pcm_stop(substream, SNDRV_PCM_STATE_XRUN); - snd_pcm_stream_unlock_irq(substream); - } + if (substream) + snd_pcm_stop_xrun(substream); } if (!handled_mask)