From patchwork Wed Jan 24 12:10:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 125639 Delivered-To: patch@linaro.org Received: by 10.46.66.141 with SMTP id h13csp372520ljf; Wed, 24 Jan 2018 04:11:04 -0800 (PST) X-Google-Smtp-Source: AH8x227wxOLPIy7DSxo83Js/s4Np9HhykkrLCmL69uOnJcLhMM3NkkIJIKsIhovwcQLJIOSIGHpu X-Received: by 10.28.125.68 with SMTP id y65mr4453519wmc.106.1516795864356; Wed, 24 Jan 2018 04:11:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516795864; cv=none; d=google.com; s=arc-20160816; b=z9U/mC7B0eLWRsjIEIqIrQKUGN+j56bcYeajS4EOwl9BmolX2z258uH48omQKn3Jhr oGMF5YevcJRsNS9o4XjQwMOBtHy6f+8g53NbQjJMLFzICa6BsvrC1pU4dGsl4NkzlM28 QOs0EGirql5W9zHogOHzUmaNAj05PVTgoV3R86bimjfgicX7j6Ym0IV0XFONgm4NDnqy +oyHl+chuwL1Dmk5ix62U/+gwfOdA4RZDZqmic7oKb4Tu5msgTotV8NqNMd+K9yYkXo8 iFAvvfitDRv89cUaYBeK6AP76sBMcs/VSOcpLrPPsD34DSJA4T86zV2wZfVogCt+dLQ2 hM8w== 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=XBDjUh2ThZN0DpnB3vbnNDpJOPvjNITMa6IncKr5vFs=; b=KDSEqcBUG0skbbc92aZTeLxbabQ8/KYE6em3/rFt65IXvmbherE8xY+zLoBk/fdR3F f9/MNkPQSZ519s+qKZEQczlCIElWa5sERb4kMkEYivWHIQSfJX/DtqLa6yepeF99578F VLVPECH2ihShG8fY7hyuMQPTA+GLibNHVaDKivL+hc1BIqv1PhneqE+MByvlckciaQis KFxDcg3MTdVsq3rOF53ZWrhgZq3+HHdAAca8/aMzSVRq7+0ZYNrVImuxQAGsVMy4Tx0K Q3nMimjxuoW9Qbm7DZIVvxx8zNbxtgaTPc3hNfNcOHT0OR+eQ2XOrR0aoEqYdqUQvzrK mlSg== 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=wyJRm9bZ; 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 Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id g13si1997246wrg.555.2018.01.24.04.11.04; Wed, 24 Jan 2018 04:11:04 -0800 (PST) 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=wyJRm9bZ; 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 Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 314D2267440; Wed, 24 Jan 2018 13:11:03 +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 9D6DD2674DF; Wed, 24 Jan 2018 13:11:01 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail1.perex.cz X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, SPF_PASS, T_RP_MATCHES_RCVD 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 061EC267440 for ; Wed, 24 Jan 2018 13:10:59 +0100 (CET) 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=/C81EZJzz4zXG8G4q098ZvKFv61C/wH5v37bPLLxTzk=; b=wyJRm9bZaVnC PCIKCGwpZY4SwxW39b5BM+y0RbRq8dyU+AUs1yDZaruj8cTOBySVebJrDcFl0aiBFfF5yGrSZyGwv g9o5dg236HDPwoEPRg4bgrm0pcYOmv//gBbav51rdY/ZG7bLuAQg1ZtouaRfeRveXuopu7ZWhmbnJ GqwIY=; 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 1eeJtI-0003jL-VD; Wed, 24 Jan 2018 12:10:57 +0000 Received: from broonie by debutante with local (Exim 4.90) (envelope-from ) id 1eeJtI-00088G-G9; Wed, 24 Jan 2018 12:10:56 +0000 From: Mark Brown To: Kuninori Morimoto In-Reply-To: <87a7y7aaqc.wl%kuninori.morimoto.gx@renesas.com> Message-Id: Date: Wed, 24 Jan 2018 12:10:56 +0000 Cc: alsa-devel@alsa-project.org, Mark Brown , Simon Subject: [alsa-devel] Applied "ASoC: soc-pcm: don't call flush_delayed_work() many times in soc_pcm_private_free()" 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: soc-pcm: don't call flush_delayed_work() many times in soc_pcm_private_free() 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 f30a4c313eb6d5027a85869d1ccf626208218ed0 Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Wed, 24 Jan 2018 05:18:46 +0000 Subject: [PATCH] ASoC: soc-pcm: don't call flush_delayed_work() many times in soc_pcm_private_free() commit f523acebbb74 ("ASoC: add Component level pcm_new/pcm_free v2") added component level pcm_new/pcm_free, but flush_delayed_work() on soc_pcm_private_free() is called in for_each_rtdcom() loop. It doesn't need to be called many times. This patch moves it out of loop. Signed-off-by: Kuninori Morimoto Signed-off-by: Mark Brown --- sound/soc/soc-pcm.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) -- 2.15.1 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 8075856668c2..998800cc44ef 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -2831,10 +2831,9 @@ static void soc_pcm_private_free(struct snd_pcm *pcm) struct snd_soc_rtdcom_list *rtdcom; struct snd_soc_component *component; + /* need to sync the delayed work before releasing resources */ + flush_delayed_work(&rtd->delayed_work); for_each_rtdcom(rtd, rtdcom) { - /* need to sync the delayed work before releasing resources */ - - flush_delayed_work(&rtd->delayed_work); component = rtdcom->component; if (component->pcm_free)