From patchwork Fri Nov 9 04:15:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 10675275 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3E00813BF for ; Fri, 9 Nov 2018 04:16:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 25AA92E832 for ; Fri, 9 Nov 2018 04:16:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 19F412E83C; Fri, 9 Nov 2018 04:16:05 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_INVALID,DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, SUBJ_OBFU_PUNCT_FEW autolearn=ham version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 96AED2E832 for ; Fri, 9 Nov 2018 04:16:03 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id B9327267B04; Fri, 9 Nov 2018 05:16:00 +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 7CE54267B05; Fri, 9 Nov 2018 05:15:58 +0100 (CET) Received: from JPN01-OS2-obe.outbound.protection.outlook.com (mail-os2jpn01on0100.outbound.protection.outlook.com [104.47.92.100]) by alsa0.perex.cz (Postfix) with ESMTP id AFE01267AFE for ; Fri, 9 Nov 2018 05:15:51 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesasgroup.onmicrosoft.com; s=selector1-renesas-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=z5cZdf5KIk6C7FRCBBGVewTNignYxneX0GNUZW8hCHs=; b=gu0vS0QjWtSmmKLdj4Xf5zuzbLH/vgGmSXlNd3YQweLeyTaqwKR7kqYq2wbTaUET0QqC/yoAJ2gNr+2f9Rtf78D7Hlf2f8Q28fvsoo/zM8P4g6kY+uAuqgjZRidr6Un2IV/t96QvLogjfgCvEmeCiKzNvaCWajSEL6vwvWZoj94= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=kuninori.morimoto.gx@renesas.com; Received: from morimoto-PC.renesas.com (211.11.155.130) by OSAPR01MB3316.jpnprd01.prod.outlook.com (2603:1096:604:52::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1294.21; Fri, 9 Nov 2018 04:15:46 +0000 Message-ID: <87lg62ki78.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto User-Agent: Wanderlust/2.15.9 Emacs/24.5 Mule/6.0 To: Mark Brown MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Fri, 9 Nov 2018 04:15:46 +0000 X-Originating-IP: [211.11.155.130] X-ClientProxiedBy: TY1PR01CA0189.jpnprd01.prod.outlook.com (2603:1096:403::19) To OSAPR01MB3316.jpnprd01.prod.outlook.com (2603:1096:604:52::21) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 04f32a26-33b4-45aa-a66b-08d645fa0606 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:OSAPR01MB3316; X-Microsoft-Exchange-Diagnostics: 1; OSAPR01MB3316; 3:iqUzL/qjI5e0fXJB1gw78UeN+PX/FF7FXaPOBky9oNpGaXp+ZWwyqGGvBplISF0FyLFY5IJ8yVUwqWaul9Nqm+uB7+GwqjkvFMMvMfvnjwBWQYiD1gF+zMc8WWfk2l3STP6BSfu9Hx9RSFIrRNDkwmu3eHM9XqVesrCW1aaixN8g8g26Jazq0g84Rcpuefx5nL4Ad17cDV3gxppUPW6KmGYCTseWPECd4qFDIlqYEVHQr+KGtsIZukEaRUZ7ammA; 25:gGaWOMFhLYnit9OMQfE/OQk2U0/l2u4u3NusyzuerYRYPeRNpCD7zQvJCWdR3Hiil+ZVinVY7L/RJbFAveHZfZlkf3s6L5bpK1ALj7hsxr1MV+VaUr/qIyt8f2PlQWEOw/vBVhvF0aU3lHAxyJa5Gzl+ynP7dQ5s4mgeTK6+TZ9HLeHZnVSPmNaCmj64Xnl7wp+tTjf6KtFumRaCf9cVqOxtCl8sZI7i10KeoAC6YCpomAP1FhQSuY/sOlGABq+wl0wgw5vNs+TxDE8A4T0jbUdEJHksW+8MW9FYBa//kjKgbwkaQ2dHVsRRGcYOBUaVArogYz7l1ooxqhXPpohFhQ==; 31:jBZ39rnH2dR+/78pKm8VmLo94X8ALCkJH3n3u7TE0mY79O51wEfo+eHh7lKJj3V6LYu9bD82MO4jYL0XppGRALSIixLFwTL3xRwCDBOaQ8ho7CTvraB/licBrjXqNpHp7n02xsVjjnvuevi1oWG9xFKF2L0GCx5C7Cm1WLCOhrHN+DQq5c50L54RcWQ8mdAwt8c55FvyPQrNpXYASmslmHfkU9UscSqurMoSAVUR0yc= X-MS-TrafficTypeDiagnostic: OSAPR01MB3316: X-Microsoft-Exchange-Diagnostics: 1; OSAPR01MB3316; 20:XY40KaZiv3/JMXu1MS8c3t0zZ8h0a3K7tpF+yz9wY9Juq69qPQup96f+YetaDtiRJ2xdHj+FuIsxOIxjMC4IzRAw6avNGMXKBKSKYY5mWsKMWyKh5eUWKmT5HZ+ShsaomWc595Ck72QmYhoQHDnWTsZ2sPJlbAlL5y8K3nvkVPg8bPFB/9xqb7rXeAUshuyEUxcIFSuEMJTM1jPmpcYEJCNDQ2VYXWspKRCxWWS6TVwQFMA7OxuU836zF1yFW/DHhrfX02YkMWnaOSb262m/HWZ1+bsXOOVBRjslqvJChFPfDE9CE8FfMkkCKSYPSWS7UXB4lg8W/R9GIq7kZfVNJ/ebIwTM6kiH7sDw1lb6PqaebpD41ImTfTQXi3n9FBLqSV8Ym+Nd58wXMUf+9BBfPU1hAcjaWMR97pPiFMJ/XrZFBBDNc3TWiiBgoHZUbb0mVYleRo2oJagu3o4rQTHKtznogHJPmbR9w4ydoGTKMPJY2rwOXC+6kk+iFjaLg+CO; 4:2HQ2biBtOA80xl5Umw5Jnu0E63aIiSYb9Ok1m7wv0IKKYyl7a7nlpYsTQiFgDqccufv3jW17Yd2c8pJQBaULhH7ea57bQCwgsPzZ4Wu7pKQhlNgakWvC1rRlmfLsjpi0QZpTUHR86vWTn41RG12ptqvR8wDW5EwSY4Ekv6vgHsmJ6mXn08F8Btk+LtUBd1u3UNWL9yHe6ELk95GsjwIvK2VfIoqEnGv5VcxbhozWKS+A5rwFBJA0ApY98w04ObIlxnW1ubOIyAet5Yc3S4Jr/w== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3231382)(944501410)(52105095)(3002001)(10201501046)(93006095)(93001095)(6055026)(148016)(149066)(150057)(6041310)(20161123558120)(20161123562045)(20161123564045)(20161123560045)(201703131423095)(20161123555045)(201703061421075)(201708071742011)(7699051)(76991095); SRVR:OSAPR01MB3316; BCL:0; PCL:0; RULEID:; SRVR:OSAPR01MB3316; X-Forefront-PRVS: 08512C5403 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(376002)(366004)(346002)(39850400004)(396003)(189003)(199004)(25786009)(23726003)(386003)(3846002)(68736007)(6916009)(53416004)(86362001)(105586002)(6116002)(4326008)(2906002)(50466002)(305945005)(7736002)(106356001)(575784001)(5660300001)(7696005)(52116002)(36756003)(486006)(476003)(14444005)(956004)(186003)(2616005)(69596002)(26005)(6486002)(53936002)(97736004)(16526019)(47776003)(58126008)(66066001)(16586007)(8936002)(81156014)(8676002)(1857600001)(81166006)(508600001)(21314003)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:OSAPR01MB3316; H:morimoto-PC.renesas.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: renesas.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; OSAPR01MB3316; 23:Adw/ijnpwkVX5XpJRFOHnRIBXlEYL+LEWozhFcyxA?= EMsktDnhpn1tg8FuojHiOJk69h8UB44nV9jnwyoByg4eSfbb/NmbjkDrKA/eB0FVtuDTy1AJAZV/UTrXLZMzfTFz38mDZSL5njY5AmERAoO9B7jWSqsQkSuOSe2lpWKGNub3FNZJgnKZso2guw90PgilDo+ZF9Ef9eKG8Cf8wdpN5nIBYkDDEPc759I+HRW3z7dpkFFB664ih6MsDBIJC7luFnyh/d1y/RFqJRAmm/U7NiR4PYSIgwERsM4QQv61ltBDDsbB8b2DMZpY4CliXH1+rZiUXAz2qLNMpjP15QJBB/lWO00Jc0EJNqDQYlG2xDZLiIpjONFaQOTc8tHYd3/zxVWbb6tJCTTyGyuyKSLhMbfhyOQwCm0/zNgVuz8r/Oz/X54G/RP9O/3PnuXslqjdiULyYAMoX0/zv1nmQVOTkXLTglO5TQIYcwCe3Amvf5Ju/JBBe0mb1ykNrNbNgwW8+8R4KllMCXbw2Ee0DzM7Dj9fOhWUmiwAIuCo9+a/n5W00S8Ou/catl6Vl1TASWloFT4CiZ5ldFVZW3cmROVZULxEZQtoM3rhpMVgyLMzy8DB5UI32mOOopTBAUrhQtTRTaN1oowrf15nwa3rB1wZtQBTI+kPpEZ14aY+rZ5w56f6dik5XpU4Fdq/pAJuDqPg40shubFlQVWjBA4BSeqzryhOG1AHukOqF4kaPSHLYdTm37z54opSA9zS0IHJf2dW68sK+dc5fEK3o+CUrIhD3gCt8ff1YsoRvWI9gPeVXdw8Om+muW67NT1xTR4bCjOLiPxZBcwRAnYiCkrJH9cJm8nqKtVDNBcrVbjKvMxwb/GCkdWmRvWMAt1x3wm06OIJJnGT7kND6jV+LsD+kQw+QvPQGm1BRXjoWJNTexgPm5Kszxbj0jwccz6MgqPIJbofBRedHlVLe6IrU62bRCIGe0bKN7sqVYPfwWAbkRQEnRvZZJ2vN/eOkZkR6Cj5QyaQN1qXIRkK4MHdsKGTadu66dtyxW8SjdnjQY84p53mFuKmfyrCt4NWzMFuewckJscd6hHn1JIJN8DhY2K9G6NqCedEDPYGpIdajJlfagBh0A5vKW1t3nurgfuMHdkcOC93jlY1gc8wK4sxZ9YFeIG6kLWvxQvdVJjiY/ZZX6Aavc= X-Microsoft-Antispam-Message-Info: tI+zgPK9p4polS++b5TssxVp8nzTKikHQ16SreHIMD4cgqGJwv0JsTTkdXVlbjmEkUAZMfSWBJDkvBbZTmCvP/z8jq7na+KCfEtkbJFQO82KLrMRHGLy92cauXV88dIzi6kkJ/nCA1ep7d09V6m+lhsQauGsZyHV4pvZOCN8vuSl+uR8b2hG8OhO/ifCo2TGc7DS5v9TTL/Om5Ck0L44TbkrOYak+Y++H6VD1Mn99+3A3ca9nGigaA10P1ALq1yWCaeYEPJLhI1Q3jkDroNaT9fcNE6F7o0eu9vjhMWgsqZvb7kVk4FbcZlsBgTVgcaocaHT1rq90H0otuswK1PMTf2TefLtE64Yf34qaVvgaSw= X-Microsoft-Exchange-Diagnostics: 1; OSAPR01MB3316; 6:An7KMVLUAJkQiARTV+Voax0k0ijH0CtpVm2m3A1bNATETLMq9fT4Ai369wMGM/6FAh/TG5t09lN3+oDShiQIXb4IGTBugtNRIeKe4GkjDxm7tJLunAF+wheT7QNy2AzQpaWDQFUwCQH7hobIpcrxu7T4zy963UqsLX6zW0OtpN8yWaRJuQlCQoq8AK6L9340QDmyztQ3xalf2rMVpwAyLJkBViqyFMuHrYHuWNpxwzDCYwx3P/s/V5rzRoorVEPOHb16xUClNTyNGtC65Uij8wK8zJDbrC8FAwdvEcnK2/yEClsq5KpO1QyvEssbOGNqOp0zw8fX+BEv4kTJUZ47Y2MiD731Pjo3XPUomqv3NcHrUKYFeqtoRYtIcZ7+LaiDTUwHvy2+idjwKMF3UU97JFHui3YQGmiLAg/2pt4SjINJinURjvr+PCG2ZLC7msZ2hbyjglt3dnGepHwS3pyWyg==; 5:rha6rLdY4Z1QrbiqJm5J6NK0ZC54j6uBarazoBLtBpDoercMKkmEGpOimKA/V8Kl4MrCJNF38lIFKUMmnPxiyrtjhZX7ONvVhg+yxYbsq4ZMGPtjc42TC2aiaBZL/AyadPkiUv0T+z378mSumv1FdlwW97/kkUmTV0+dyS/vZcM=; 7:BjLLFrgyNW/1+y4sFgdMD6Tffj6ANSetES426aRYfkb6gXLpKxxe18C4dxTWR5G7SkH/Rxo8mOWzQA6c8qnxJU2SqOTUr/0/dFR2Di5hHYy+iBfFjBvxa86s1KtzEbwcnTYfdkV92DwoE3gDlyO8Hg== SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; OSAPR01MB3316; 20:2bLcjYO9zK+c/G6zsqzl2QmYD7HgpW2ovdWfaimR6Xo1BaQ+jNDJqwqGK2PYtA7kcq3qcUzcId/MZj+yv79ZhhV1i7Tc25ZN6CN5TJVOXiRs5UWimUbMb2j9ZhI5a+/yi/pTkGI8q9On0kEAbBy+cRUyCP5nHHh+H0u7Pietias= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Nov 2018 04:15:46.3962 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 04f32a26-33b4-45aa-a66b-08d645fa0606 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSAPR01MB3316 Cc: Linux-ALSA Subject: [alsa-devel] [PATCH] ASoC: rsnd: use ring buffer for rsnd_mod_name() 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: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP From: Kuninori Morimoto 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 --- sound/soc/sh/rcar/core.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c index 12f559e..56469ac 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