From patchwork Fri Nov 9 15:58:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 150677 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp23789ljp; Fri, 9 Nov 2018 07:58:15 -0800 (PST) X-Google-Smtp-Source: AJdET5epqFtiob03mw6wVBnn4wbG1fiwbZplb5RjJFlyc/4Fu/mD6I0oybSP0Bwk0yrFfyaMrDrH X-Received: by 2002:adf:ee0f:: with SMTP id y15-v6mr7379183wrn.11.1541779095727; Fri, 09 Nov 2018 07:58:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1541779095; cv=none; d=google.com; s=arc-20160816; b=IjMoL9Aq7r7vnbbX+9KrQwfOz2qSb2jZjhYjZDaMIZSK9AZt3fF0lS1SdtUV19iqtU VUhBv0Dd17YuXvJxYhMQYwvbd1kkxBSvXswL2tSB/9PXLLa5TNUbyc2Rfl3+0djurCoY XIhVKbJLnQD0dOW6kUi3MzwB3KKO8SoewfsN+gq9ZJZv5Tyr6QeNHpV+NX/POYgfh7Pq Ma0hhEyiVkdqYJkFRp3lqFeoT612P7/GAGvI3HT897y0pzvpe2zWlr79a767PNoSM8AC e4QITZMH3PigJleJ+oDNi9GzUapSJW/Ml2aaWgB9D1aNra+24CUN7+aESC9/ygD4SZEi e/9A== 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; bh=SU3oFJ9f4gebbKhEz5AMvCMH9hoA4ZTQicJqe1P4rhU=; b=Mg+YzQbeVFkWB6L15tQcBQiYtJGUf5HAyoiXLFXAlFXPlsdDaVJPojjQQAiRrITfc5 ddH2ZSShg/3+jI8GcXSorQFWffN6KTXMVtfLpZ8w024s0GG8UpzHL/2F2ei08+f7lt6h 8uHI/CdUOX5huYSQ1VKpdZTMxB5T2fALor1lo028VUmJ84ve9RAI1QC7Tpo0HhU2ZNnj ZC774dePYyRdR35qb/PnMOdpL9DNhXbLfSiwq2oWTI2kNrEemOlpgYGUtvcOwKSVokGh wtnSX7TuXI0VKJfkbpjMhjBv9QdY4udqmHBeyhi63VZ7iAE/MuzkPE0gSdOzmKSJpUYC lr2Q== 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="tEufu7/x"; 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 v28-v6si6801932wrv.331.2018.11.09.07.58.15; Fri, 09 Nov 2018 07:58:15 -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="tEufu7/x"; 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 B7FD6267AB4; Fri, 9 Nov 2018 16:58:13 +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 15AF0267AF7; Fri, 9 Nov 2018 16:58:10 +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,RCVD_IN_DNSWL_NONE 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 32AC72677E4 for ; Fri, 9 Nov 2018 16:58:06 +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=Sw3gIHJn5UPJ98qqyfsIezKfs9xPNOsnSB3BnC72FF0=; b=tEufu7/x/7Sc Emy8+0Jo06THl4RE6pmVbEC4+xsbWuoAWUJGsBpg9mChlA9R7OoPDmjQDAHgJ2jqKelQAXZwElxiy fz7K3ITOL7GvgrBJM+ZsIAg2g0aJ270ujJeCiSvYDQ95OfQYZaQtjKOYe8ipoq5GrqHgppUrYz6eI AQPdY=; Received: from cpc102320-sgyl38-2-0-cust46.18-2.cable.virginm.net ([82.37.168.47] helo=debutante.sirena.org.uk) by heliosphere.sirena.org.uk with esmtpa (Exim 4.89) (envelope-from ) id 1gL9Ab-0002KJ-Sa; Fri, 09 Nov 2018 15:58:05 +0000 Received: by debutante.sirena.org.uk (Postfix, from userid 1000) id 652541124E6F; Fri, 9 Nov 2018 15:58:05 +0000 (GMT) From: Mark Brown To: Kuninori Morimoto In-Reply-To: <87lg62ki78.wl-kuninori.morimoto.gx@renesas.com> Message-Id: <20181109155805.652541124E6F@debutante.sirena.org.uk> Date: Fri, 9 Nov 2018 15:58:05 +0000 (GMT) Cc: alsa-devel@alsa-project.org, Mark Brown Subject: [alsa-devel] Applied "ASoC: rsnd: use ring buffer for rsnd_mod_name()" 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: rsnd: use ring buffer for rsnd_mod_name() 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 0246c661b6f0051ef7bfbfff01d8ef7fd0359372 Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Fri, 9 Nov 2018 04:15:46 +0000 Subject: [PATCH] ASoC: rsnd: use ring buffer for rsnd_mod_name() commit c0ea089dbad4 ("ASoC: rsnd: rsnd_mod_name() handles both name and ID") merged "name" and "ID" on rsnd_mod_name() to handle sub-ID (= for CTU/BUSIF). Then, it decided to share static char to avoid pointless memory. But, it doesn't work correctry in below case, because last called name will be used. dev_xxx(dev, "%s is connected to %s\n", rsnd_mod_name(mod_a), /* ssiu[00] */ rsnd_mod_name(mod_b)); /* ssi[0] */ -> rcar_sound ec500000.sound: ssi[0] is connected to ssi[0] ~~~~~~ ~~~~~~ We still don't want to have pointless memory, so let's use ring buffer. 16byte x 5 is very enough for this purpose. dev_xxx(dev, "%s is connected to %s\n", rsnd_mod_name(mod_a), /* ssiu[00] */ rsnd_mod_name(mod_b)); /* ssi[0] */ -> rcar_sound ec500000.sound: ssiu[00] is connected to ssi[0] ~~~~~~~~ ~~~~~~ Signed-off-by: Kuninori Morimoto Signed-off-by: Mark Brown --- sound/soc/sh/rcar/core.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) -- 2.19.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/sh/rcar/core.c b/sound/soc/sh/rcar/core.c index 12f559e0463f..56469ac4bc8c 100644 --- a/sound/soc/sh/rcar/core.c +++ b/sound/soc/sh/rcar/core.c @@ -137,10 +137,17 @@ struct dma_chan *rsnd_mod_dma_req(struct rsnd_dai_stream *io, return mod->ops->dma_req(io, mod); } +#define MOD_NAME_NUM 5 #define MOD_NAME_SIZE 16 char *rsnd_mod_name(struct rsnd_mod *mod) { - static char name[MOD_NAME_SIZE]; + static char names[MOD_NAME_NUM][MOD_NAME_SIZE]; + static int num; + char *name = names[num]; + + num++; + if (num >= MOD_NAME_NUM) + num = 0; /* * Let's use same char to avoid pointlessness memory