From patchwork Thu Jun 30 06:04:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9206659 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 F143D607D6 for ; Thu, 30 Jun 2016 06:04:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E2F4B285B7 for ; Thu, 30 Jun 2016 06:04:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D7BFD2865A; Thu, 30 Jun 2016 06:04:17 +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 7C2BB285B7 for ; Thu, 30 Jun 2016 06:04:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751052AbcF3GER (ORCPT ); Thu, 30 Jun 2016 02:04:17 -0400 Received: from relmlor2.renesas.com ([210.160.252.172]:61543 "EHLO relmlie1.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750937AbcF3GEQ (ORCPT ); Thu, 30 Jun 2016 02:04:16 -0400 Received: from unknown (HELO relmlir2.idc.renesas.com) ([10.200.68.152]) by relmlie1.idc.renesas.com with ESMTP; 30 Jun 2016 15:04:14 +0900 Received: from relmlac2.idc.renesas.com (relmlac2.idc.renesas.com [10.200.69.22]) by relmlir2.idc.renesas.com (Postfix) with ESMTP id 8A69852B9A; Thu, 30 Jun 2016 15:04:14 +0900 (JST) Received: by relmlac2.idc.renesas.com (Postfix, from userid 0) id 8CF182806E; Thu, 30 Jun 2016 15:04:14 +0900 (JST) Received: from relmlac2.idc.renesas.com (localhost [127.0.0.1]) by relmlac2.idc.renesas.com (Postfix) with ESMTP id 867212806D; Thu, 30 Jun 2016 15:04:14 +0900 (JST) Received: from relmlii1.idc.renesas.com [10.200.68.65] by relmlac2.idc.renesas.com with ESMTP id RAJ03710; Thu, 30 Jun 2016 15:04:14 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'";a="214096276" Received: from mail-hk2apc01lp0209.outbound.protection.outlook.com (HELO APC01-HK2-obe.outbound.protection.outlook.com) ([65.55.88.209]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA; 30 Jun 2016 15:04:13 +0900 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; bh=81mx+MyXEzQfYFx98VbpXqOrYvzquppxf7R17aIGj+U=; b=R1DbraWk6QeWyaohp3U3cQc1b9ESJIwJT8Nk42Cxi5voy8hLai64crRRWNqkWeinq3K9lFrB49A87fiV6o2rKfUxO9QAFhwQJlSUqaZVZK7+fkJL62D8Iy5yvm3kEi2rMBnGOLGnusxDklwqCzMcsHyEALMKDY9H+EcOEOsm63U= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=kuninori.morimoto.gx@renesas.com; Received: from morimoto-PC.renesas.com (211.11.155.144) by SG2PR06MB1712.apcprd06.prod.outlook.com (10.167.82.142) with Microsoft SMTP Server (TLS) id 15.1.523.12; Thu, 30 Jun 2016 06:04:11 +0000 Message-ID: <87r3bf9q2x.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 4/6] 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: <87wpl79q79.wl%kuninori.morimoto.gx@renesas.com> References: <87wpl79q79.wl%kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Thu, 30 Jun 2016 06:04:11 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: OS2PR01CA0047.jpnprd01.prod.outlook.com (10.164.161.157) To SG2PR06MB1712.apcprd06.prod.outlook.com (10.167.82.142) X-MS-Office365-Filtering-Correlation-Id: 9cd92e2d-4d5b-4950-47c5-08d3a0ac5b9b X-Microsoft-Exchange-Diagnostics: 1; SG2PR06MB1712; 2:Be0Z2SLlJwF9bOSDkZyhG3LGBpm8qUIERzXooY0PHmSIR9FDUkOPfHQgjGzot0pOGwRotgbyXMOWbQUxpF8UnsJ3xI6BppWTQSUAve8xrYQCJpFqn+ECqZRaHinufg1o47fCC8aXrgfp4Z+Nk0pCiksPPIq0kuOWLi1xGG4NXenxc8T7DZA3CLHKfW1tPnyZ; 3:NCsuLnUTh+AFrF5F0Vi2PjaMsDLk3iujU0MyYRoJ5PSW76t149zGdcmdfwu47eOvojlVJUG/fDXmDHBM9wS7tPbCRK3R1/Vns3PPx9e/gYuxJcXM0C6gfwwZB91GP7Lk; 25:WW1l0YKGnwDTzc2oR7fN6nmoxIsIKg5BQRJkH7mqnGvgvax4G2UbQVHw0vtRWCia7EOPZ45LPIiTZW37/J4p/OaCITwZMyDLSacx6jFN56bWjwz4TFw98xuhOEfJOBX0VI5mhRCkHvMpqNqIGBumJk0/+V80f5SwghY7+/rtOcobeypAeiRWmKeIUhyC3mGFQfC6GmOiIZKnrXHZ9QhZt2EGvsjkOuXBECKN55L27KgX/XQGMz2adyZ/3NqNLt2spK2+S/KfVCgFqNyPZ3q7Fm6vRZnUrtbBtmQdbgh/FkENXeDUwAmtijgYegTKDUr5zfuUiqC9wlA7h64p+twHh4PqdWxAf8nC0RsPZZAkvTXhDu9ykRPu+2mrzYwFb+WjN/7lKQyECR9/CcplE7v0EQB9bpQIKH1HmMU8lb3zXqk= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SG2PR06MB1712; X-Microsoft-Exchange-Diagnostics: 1; SG2PR06MB1712; 20:8d0mM1RqmRCTTnYlCcDp/gaFw4p2w+PaJoI3YUHtEVIqB/sB+drF3PR9romXxFvcRAvU2Yf59IpHwRjQ1fUZqwbHy/nJ3tSZd+/xj+gu+ziC824AZ+hMgIZLVbuvgNJPIrewSQSD9HES9YNAcndCk5raLlMyGwSmknBkrKEdsafe3kvsv0NeUgTRFWKT8D6QZF8xfPUNRJVmYymnw+oz3b3ez4w/JdeLSysi5IKMalScAWqDQNEUYmPRnlYI9RBlSBiUd2r30jOzHtUxa6DhdGNmVGgbXlJs10utuI/moKoImc4V6VxtnBS9+ymsCi1jybCLu6Q7FVC30GhGGMiBo5XypfJPvklHFMnNmroPHSWrvQgdZhSCUzUB10ce74ulOTOs9XFhXfJbULj4beEgWJGp2TLqiOGbi9isG2XFskizrrqTpLI9lh3+0TMSc4fncOum1t4YcbhiJ1VXIxf21jZINW+OrXJAy+QAnoQCmIWPVDdf9xY4byYxNdle4QW0; 4:8OjG9KGxYLntuGYnqDi23tNTuyQ/AXkW4ppxgPJwxygga5rnQxGP0hpP6aS1KVLUL7zC8WCDGNNoS3PnVx6WtRGut3cWKixwmoc+4dTtI0SzXtEhMW0m3ZiCD0nEd/GOOnL2/jLOPcvxqldeUi3OtetGZeXTxs4UAqHaQfZCkh2q1l/p/6vwj4qtM0rAZpkKBV/Nx4NgkiJcAHlWqfbKBZi4mhgP6UTmZ3u1JIaYguzELQPSZNLQ9BDWbWNWqUkKFnkcpw8+BTy6fNo39VChuUenpS8tPb/4G+Fb9+Ym2bxJ8e0JN329JP1eBmjHN7a89Luap5IZCDpHVjfhJnMuKaiOXfCSns6VHM9RcZVTMza3OwhElVi3/JmVU2m1GEa7pDFCTfmF9PwCzw1LHES4Yw== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(5005006)(8121501046)(3002001)(10201501046)(6055026); SRVR:SG2PR06MB1712; BCL:0; PCL:0; RULEID:; SRVR:SG2PR06MB1712; X-Forefront-PRVS: 0989A7979C X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(199003)(189002)(23726003)(66066001)(83506001)(3846002)(4001350100001)(189998001)(50986999)(76176999)(97736004)(7736002)(54356999)(586003)(36756003)(2906002)(2950100001)(77096005)(110136002)(53416004)(92566002)(86362001)(42186005)(4326007)(6116002)(81156014)(7846002)(33646002)(81166006)(8676002)(106356001)(105586002)(46406003)(47776003)(19580395003)(68736007)(19580405001)(69596002)(50466002)(305945005)(229853001)(101416001)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:SG2PR06MB1712; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SG2PR06MB1712; 23:AfCSePEhcZ6zdPYqW2EoL+54v/XuJsaJSxe0djhyy?= =?us-ascii?Q?pzgp0SYAo4Xk9ysM8v3Q5sms5Lizh/9Et4jkWG/4k0f3k1pCLlCTMi8e/xDB?= =?us-ascii?Q?MjbSXcmc4oN3EiZIP9ZOSJb0FLCgcl3KhjxmICgekQl7QGNgDvF5cbG5sodn?= =?us-ascii?Q?XVENa3Em5WlLAhhSmziaAti2tsbwLOPooP/CNvzHr3vEjLtRqytQuEH0LsMM?= =?us-ascii?Q?XlyzbIre9P2sDBRMhr61pgiIzzTjyehvxebxSoz1WDOcV6Xds5NEj/MZrFO5?= =?us-ascii?Q?pCZSOd9+VJYJc8+7BZssQ5lQARLR/ecTmASMii1E/LJMzAkN+BePy2UFbZ8b?= =?us-ascii?Q?K6eUMwSw5m3el9l5pbuWyJxViYelGuo2m/3qVuntORiKxZwLMCdgUxxFtpy5?= =?us-ascii?Q?TpjNlg243opdUW3+5CKvis4OC1D0aPG4hY2Q3O20Uoj5GZuNJ4lIj9AxPpcf?= =?us-ascii?Q?EAaLZTTfaKMzyAvUkBNdHioBNHcn+ov3NwBeU5p9ht5tF3hCDJNq5kdJb4w4?= =?us-ascii?Q?xb1Fs6dqFg3NDpytX0eCavkueq1/CESpoVD0sI9TRcu51YTfVHsddXXonLoM?= =?us-ascii?Q?z5mJsu36F3ng9IZv87gq21tK/QKunzxYkbgi/FGZVIiJZBuCk6qU18z75Le0?= =?us-ascii?Q?pdmd2ixhthrHX3oBidIarryx8ChIMBYT4xM01YkFjcbjSUrSW3yDpKOkq9tz?= =?us-ascii?Q?hwlWsQWNgyvbZxqdUCZ+383pm6JGNNh17LF2lQD2CB7kk7cyFR8sRa+WXPN2?= =?us-ascii?Q?uwAZMgtRPdr6oZ8QDmOtUu/isVbX5O49lQb6/RpfJ74+v5Jymk/qdaO4LBZw?= =?us-ascii?Q?++mVDUdWAwgmY5YahLm8RXGRzLZK41MHxGs+yOsK7cr5XFRJYjxS5L05Il30?= =?us-ascii?Q?m2m1heEcnbrIidk2oLp6EyfRprU+Duq+UjlOwquwoOD3FmRIM2Hk7UfkKJdd?= =?us-ascii?Q?tJX7vfng8LcfQIs/Qn4W/ykEjTik5nhtmMs02ZPckA/hLcli7FCp89nXy7MO?= =?us-ascii?Q?ReuMqtElylnRTup/LxXNyYmHmkRMrVp42VGySVpQTReLuZSUbuxZwTHmQf8h?= =?us-ascii?Q?NuNGvYVnheFeKaAuJO/IDc2yAGKItx3BgWF9glVTLn3WIBB6zGfFzzFnOrQt?= =?us-ascii?Q?AL80Z0J1ko0v4uonjUpCKR8BpaxPxeW+NCTamLB8ljrp5n7yBlr/A=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; SG2PR06MB1712; 6:a52WLr2Elw0jTubsJbH38e9slnNcQqYPhOIqwHk/Ux7Yf6A5SoK0mC34tUXDre9s+Kiq3/JV96UCun8UwC6Wu2oeAnqMgEgzWeZeTw3LOgYXTlGBa0txawGgt6P6HiBoMQdE5qXcz7Z8hWegSed3Rlh+OUoqw+XGOAakMXKddPIKbZl99Zlg20obk1GRbRwViERPHj//SxpITXWiOcAhwpVogubxCSeBb/63LvFZDlHV+X5crmSQUbnwPhjF3bTwquNQGFhdJNHcTWz7DthPmULqUkkn4azwWSln6X8Wo+PbErnwCbLFcapOmaDfIh97vEBRgZkihIyn50I5grgGT/eLZYq27WKkGIMjgt2wQ0o=; 5:js+S84UrkXifNMdQDCv9M6deRyh3xVbFC8kpITQizReKQVGScpR48bzxgjDmvoCTLIbzNkEWisR0Ob8Si+BxqVS7TAsCpRjbvloSf7GQ1onWa6s8h7HPTZAfanxsTSgCt3+khoAmqXbIo4uIvOO3qw==; 24:Gz2vdDtTMSehCDG8D3Fl+hvxzf1aDa9qAimu/Ifl7H5WXtS0ynGJV6pQZ62BDuYepO4NQKttdcxUfoxWt+A4c3hOnAPUvkOjGUbYdqyb73c=; 7:mxYpof4syG6au6w4npGnK3Uxew6IlasFvj8HJcAxTHeMiuY5FQuomGylhL+Gnb0n/mHhaTxmcrUcZ2ZhbZFjOmPeFQtmCBmciOQ7moiHxUKkfXmX54LQ9+QDcC78VoTccZzU6CX0pGNe+kiD+0eYHEGyszFdJV+B/1mPCtkZ2XR8ZxM/NPq820OQSSnvVNm/9Zh7m8lA9vvRN4hCRPRmh5DmuprY1LR7hDq9VXujq/sNEqYvIHiNO3EjurNZr4R7xr6SbU7s4U65uKikfrzifA== SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SG2PR06MB1712; 20:gAQIpoR7xqKBNgDVY9W2/sJAr74H6ib1TBOLufUQ5RFlovzuvZ/pSj26xIn9EC27lmrFM3dTOJXIuQHuV6h2q4VOODM8NgVkS9gtt3n88f3WMb42tCZX1JqMMriu9oCnpj/lO8yfTrKeXTV5N6dU4ZfKI3JAz7NP56Vyay2fTnE= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jun 2016 06:04:11.4578 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: SG2PR06MB1712 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 e3a32d3..7dd5dc1 100644 --- a/sound/soc/generic/simple-card.c +++ b/sound/soc/generic/simple-card.c @@ -319,7 +319,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, cpu_args; @@ -380,19 +379,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;