From patchwork Tue May 31 09:07:02 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9143899 X-Patchwork-Delegate: geert@linux-m68k.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id ED56160757 for ; Tue, 31 May 2016 09:07:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E0BB227B89 for ; Tue, 31 May 2016 09:07:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D3EEF27D17; Tue, 31 May 2016 09:07:35 +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=-6.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5690327B89 for ; Tue, 31 May 2016 09:07:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756118AbcEaJHd (ORCPT ); Tue, 31 May 2016 05:07:33 -0400 Received: from relmlor4.renesas.com ([210.160.252.174]:45210 "EHLO relmlie3.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1756899AbcEaJHS (ORCPT ); Tue, 31 May 2016 05:07:18 -0400 Received: from unknown (HELO relmlir4.idc.renesas.com) ([10.200.68.154]) by relmlie3.idc.renesas.com with ESMTP; 31 May 2016 18:07:16 +0900 Received: from relmlac3.idc.renesas.com (relmlac3.idc.renesas.com [10.200.69.23]) by relmlir4.idc.renesas.com (Postfix) with ESMTP id F226649683; Tue, 31 May 2016 18:07:16 +0900 (JST) Received: by relmlac3.idc.renesas.com (Postfix, from userid 0) id F21B918071; Tue, 31 May 2016 18:07:16 +0900 (JST) Received: from relmlac3.idc.renesas.com (localhost [127.0.0.1]) by relmlac3.idc.renesas.com (Postfix) with ESMTP id EBD1218070; Tue, 31 May 2016 18:07:16 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac3.idc.renesas.com with ESMTP id UAH11352; Tue, 31 May 2016 18:07:16 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'";a="212432191" Received: from mail-pu1apc01lp0022.outbound.protection.outlook.com (HELO APC01-PU1-obe.outbound.protection.outlook.com) ([65.55.88.22]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA; 31 May 2016 18:07:15 +0900 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesasgroup.onmicrosoft.com; s=selector1-renesas-com; h=From:To:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=rfu/c/Xm5FbX7aQxLNTHIo2gngUz+hE4Q85+KUH9jZU=; b=dhiynQRIqo2wwIash4qIDZvXvxyu3NrQhhhCd93BH3pegz+LygxETpdaVC5KCHi9Cu85ynGxpZ4uk09eCA5YSeLc4OtkvFb//yH5hG8aRE8QdHUYsXIkNopc6zcgC7smqj3i+iHxN0yfGwf0KMfn81WPPIRd4lHSBJ9ckpZw3+U= Authentication-Results: kernel.org; dkim=none (message not signed) header.d=none; kernel.org; dmarc=none action=none header.from=renesas.com; Received: from morimoto-PC.renesas.com (211.11.155.144) by PS1PR06MB1705.apcprd06.prod.outlook.com (10.167.53.15) with Microsoft SMTP Server (TLS) id 15.1.506.9; Tue, 31 May 2016 09:07:02 +0000 Message-ID: <87mvn6r495.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 20/39 v2] ASoC: simple-card: use asoc_simple_card_parse_dailink_name() User-Agent: Wanderlust/2.15.9 Emacs/24.3 Mule/6.0 To: Mark Brown CC: Linux-ALSA , Liam Girdwood , Simon , In-Reply-To: <87fusysjam.wl%kuninori.morimoto.gx@renesas.com> References: <87fusysjam.wl%kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Tue, 31 May 2016 09:07:02 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: OSXPR01CA0071.jpnprd01.prod.outlook.com (10.167.144.19) To PS1PR06MB1705.apcprd06.prod.outlook.com (10.167.53.15) X-MS-Office365-Filtering-Correlation-Id: 938c1a66-3273-488b-ac09-08d38932ee27 X-Microsoft-Exchange-Diagnostics: 1; PS1PR06MB1705; 2:nk7kugu11eJ6+27j5fsT8LJgP5Y32fXdjjOnhMfz/2sgVEfLRIYrczTFMoWh7mbnBR7kC++uMCpE6IPfjm3+mJQwhdctcYKbZviXuGVf0ydXJLrmisLPJy0PHHtfDOdoaRkMWorLUvnMT3RCdag4tEoK3ibgSI3D9Kuxw0gYT/yc+5Yduw1IOXXVlVaBWTjQ; 3:omcJIMVomoAMQGKzmFhC+3MwKPTQQyek/4IOS6TfNjGOyDTQ2uXI2z2ciQBuW4pNKJ54AjWpAbh4Iv5bujQbCXPaSf3k8YBQRwzbtg+pucTZlyhanPLh857psMd+b29A; 25:wQJOWuYE1YlINcLWSwhZngxRU3NCXoHOAH5/ho/8Un8A5qV3ovzJ+iyu6LiQWgLpBiVHodExaggAlKV8c1eCcT8LYtAkDd2nrD/lrPycNcqlBqOGjJn56ypXSDPMMoEYmISpfwLL52z5oOJoXYKABm3uKl0ynuDLjRbbwk6pXIBCeohmcYeZ2sZYF1+F3feC0uE7rSzdcHuRre+izZ9kyC3BBYGJnz36XsKIMubhdt/KyYW7HnPl8p99D+xQl6W/DSV6nk7/WqVHH+yO+AyaWzBbx9gTe7poEpWJYm+b3e22lFnnqUvTWUG5unHN2a5VwO2o1+uiuO5elToSowF5lNMNcfKfWcC7xOBgaPTOasY0bAZk/Bz3fqnlYUik3VcVLvQfv7zzl+0SiW8183QwDpo4noFg93eiJW0pTnddGas= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:PS1PR06MB1705; X-Microsoft-Exchange-Diagnostics: 1; PS1PR06MB1705; 20:ntteRqIDsbQOSt4HwuWv6Jh8eqLhcbOkjhExH9wESyupGyDvwwod8Q6uPaAp9TOfZHf53db1uqB6C2GYaEvAm+EcAjj5Yxm4hrvvKVkWB5IXUP+b5dyWDjDYx/fp4C+Or/3F28Mk9WZF0625xNBsWgKr2rO+axIdTSwfnstKsVc5pLQVLMLM6VQaEIwa2l+MzhCmUDQFos7LVjxnQCBNS4br5o0IPujBA4IOhZpGeEir79KwbNHU7Jddw8+E2TA0YZcXDYwSkGaGIXe4ObrmHTlVxCuboOkf4eSRi2LKOMYa02WSkFHGq04aJW6EzTj0qZs2g6d0izxbHXcTlHYiEv3qBicWInwtp/mpGoHzUj+QwaT7dnu0l/xAMRbPR8p0R3P6Xly+u01Y5p2P1g5m/Pt7E2yEkfQZ2Jk7uBZmI5K8SulIDofSmRhEW8Hcq1/CnR4qQCkLZoNXCHxJpqip2MlVbFObBpmF3OjK6GKB8/PlLflldQ3V478F3wRfG2TN; 4:jOBG4Q+vEQkPobvhjFJKaqGxg4jN4UGKEmpNl3py6PRfX48j+zfKIBNV/o2GYmxgUrlhz6K8ds1nAN249xA/HJA93XZ8Zb+TUfcvku1yLJZtliwEId01ryNzZHNKNW+9wbeXg0OJbnEilheH/wJLThA+gkrI8T7cAXE+XLkVc0NoVfPqojKNbZcNai5SEQONf4cAiWmmnWCllT6cH6oRsYuwV8O8XWKkEu9j3YMwFn9QpliC6ipVkQVCk8F1bPcSPUvO7HLamZzUOAJDRhvafx6WyvBMSewti0wu0OPQy01i56FGxo6qt65xfUonrAZxC8MrswW6cixTGhRWXSTJC2dhRqUzx39BhrblZr9W8ODt1T1T6ft/b/i1ukqQlUFfQHxnEsPhcbIzxYITesJ1yQ== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(8121501046)(5005006)(3002001)(10201501046)(6055026); SRVR:PS1PR06MB1705; BCL:0; PCL:0; RULEID:; SRVR:PS1PR06MB1705; X-Forefront-PRVS: 095972DF2F X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(81166006)(46406003)(5008740100001)(19580395003)(4326007)(19580405001)(50466002)(36756003)(586003)(5004730100002)(6116002)(23726003)(50986999)(54356999)(76176999)(3846002)(77096005)(83506001)(110136002)(4001350100001)(2950100001)(189998001)(33646002)(575784001)(86362001)(53416004)(2906002)(8676002)(42186005)(47776003)(66066001)(229853001)(92566002)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:PS1PR06MB1705; H:morimoto-PC.renesas.com; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; PS1PR06MB1705; 23:NZujha0PqGW5k1rlft70ljpVOKMz+glYEPw5wE53y?= =?us-ascii?Q?ExhosgKQSFLYp6zSJ/67jldTFO6E0JPy9Sk1Uhqx45uoydm1Hju1dHBdKp3e?= =?us-ascii?Q?y7mYpajkxLwVNHhot1FjwV271VSIuTeRxtwsWWedIupkC4EoMTmRIm40994l?= =?us-ascii?Q?iKWoD2o2rNfduHDJiicvDNbLrXld/myFxeMmsSmZKa4tx7jmm//qM6YniroE?= =?us-ascii?Q?Gte3bSRWULUPrhwjfPe+LOaB/M3avw+VyLXLl6xxZH2iSKFaRZH5f7yVvlcU?= =?us-ascii?Q?MjTdH63xWJXzujMqJRFcjNMW6ufG5dkJzGxGcZGXbDvyRJfaTvCtsvJdMIO4?= =?us-ascii?Q?NFWKg7LIC10CnlSyaNjU6JaGA5/PaS8GE65Wer5Z+XgtYukJptJAFOS7Dlc0?= =?us-ascii?Q?S+dMJqiqXpU0DDl4Y/zU+lIoo6V0dleXrlEjHRblymDs0EfezPirq7PRMKjz?= =?us-ascii?Q?L+jAz71bQfP+Paxavr9DqdbW3HzNdTvE0NL//l8DFM74s1qs+DoLzmRVVvGU?= =?us-ascii?Q?nfD8u/+9T/I+jy3/IJVVyzXkmx+MLjCDzFF0dD0XsJh8M1cZLIIMcvJvg1iJ?= =?us-ascii?Q?VnAg2WczAK9V6qgBA9NJk2DQEqSqfa1CxaUkMf4ReEnds8WBXQGr3aaN/1A1?= =?us-ascii?Q?QbF3UWFHt95Brap8HfKpGF1bGHjAYasuKNuv0CSeU9V34wSeUkh1Z4x/DFgj?= =?us-ascii?Q?6ziSFoYoBMrBvTo4HTR+7mSF0NZOIu2SVi1NfNaCwuqPZUqDmJAKBJiZ9w7w?= =?us-ascii?Q?k4AMI9XOqF2PDUvd1xSeiXD9hfJd6vT92f7xH1XwZJRv9WdAaFkbP/EcjG/G?= =?us-ascii?Q?MIYGiQSqypIw4Fwp1fKWnzLEF7VBQ5YjWaBD2d98IqlpO276NjBpn0ykK50z?= =?us-ascii?Q?dapd3oHp0ad++laAozK8PU+KdoiI+gdqfpB8r5SU3FZ4BGGKEha4D0wuj8zi?= =?us-ascii?Q?ovkjl6YAewetIh7S/n+tXYdEzZiVX7Cd6GXPDNOrcq2N/jNFLtuGdU2nNUZC?= =?us-ascii?Q?oc=3D?= X-Microsoft-Exchange-Diagnostics: 1; PS1PR06MB1705; 5:BgOOakHO4g6vaLnpZxver/kuIznkwLEHwN25WzVnBgp8NFLmC+mnutyrS5NFaWrdMUdLNF5mFcGF+N+3FUFu+E1VO9IHKlYMLu9knhRGkqtqc5owt6ewNQyobFESMWXW9fwkYmE3q8feDBfod1yHjw==; 24:HJX1/UsQgneoEugCJy0QsYQlGRcErXglNvCsKVcoOhgG9AN/FgKSl3IwmyVQAjxF7C8RbGoZ26/Vep5eAsOREdui6LM50J166f2qRLAciLg=; 7:aywGaHexW7I3z1EVddmZArj5SZKJjntVgeUpWbWoXrTcpXJWtrJHHFMjMMjNR8OSQjIZIHkY0enKbOkMj4A97xttiDlRCyDehZeaw4yvkignUP0tJTp/5CmoG1vl8nB/B7DK6IbuUgPOA0De5MKoPeZTKvcP0x6Eoa2B+sM4p0U3gRwUDkNCnDIJqEHoqGI/; 20:xGnNY7CiZhvolhYaaA3EjrR2r1jLBPfdpGmR9h7EJNM6AwHSMsUSTW5ZMTcLTB7zVzbqEV434urE5T8U6WrzDFKp9V0OQ1Kkg9AfKDpxNJmOmLl6+m6svt2sbD36mO8JVv0Bu1/0Y2dUMQPLOnjbjDPMBaAUsf8NJcuO8bWGuh8= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 May 2016 09:07:02.1319 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: PS1PR06MB1705 Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Kuninori Morimoto Signed-off-by: Kuninori Morimoto --- sound/soc/generic/simple-card.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c index 35ec012c..8d2ce0a 100644 --- a/sound/soc/generic/simple-card.c +++ b/sound/soc/generic/simple-card.c @@ -251,7 +251,6 @@ static int asoc_simple_card_dai_link_of(struct device_node *node, struct device_node *cpu = NULL; struct device_node *plat = NULL; struct device_node *codec = NULL; - char *name; char prop[128]; char *prefix = ""; int ret, single_cpu; @@ -322,19 +321,10 @@ static int asoc_simple_card_dai_link_of(struct device_node *node, if (!dai_link->platform_of_node) dai_link->platform_of_node = dai_link->cpu_of_node; - /* DAI link name is created from CPU/CODEC dai name */ - name = devm_kzalloc(dev, - strlen(dai_link->cpu_dai_name) + - strlen(dai_link->codec_dai_name) + 2, - GFP_KERNEL); - if (!name) { - ret = -ENOMEM; + ret = asoc_simple_card_parse_dailink_name(dev, dai_link); + if (ret < 0) goto dai_link_of_err; - } - sprintf(name, "%s-%s", dai_link->cpu_dai_name, - dai_link->codec_dai_name); - dai_link->name = dai_link->stream_name = name; dai_link->ops = &asoc_simple_card_ops; dai_link->init = asoc_simple_card_dai_init;