From patchwork Tue May 31 09:12:41 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9143951 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 5806660777 for ; Tue, 31 May 2016 09:12:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4B61227B89 for ; Tue, 31 May 2016 09:12:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4047C28185; Tue, 31 May 2016 09:12:54 +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 B8AF127B89 for ; Tue, 31 May 2016 09:12:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756949AbcEaJMs (ORCPT ); Tue, 31 May 2016 05:12:48 -0400 Received: from relmlor3.renesas.com ([210.160.252.173]:62907 "EHLO relmlie2.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1756903AbcEaJMp (ORCPT ); Tue, 31 May 2016 05:12:45 -0400 Received: from unknown (HELO relmlir1.idc.renesas.com) ([10.200.68.151]) by relmlie2.idc.renesas.com with ESMTP; 31 May 2016 18:12:43 +0900 Received: from relmlac2.idc.renesas.com (relmlac2.idc.renesas.com [10.200.69.22]) by relmlir1.idc.renesas.com (Postfix) with ESMTP id 9D02D535DC; Tue, 31 May 2016 18:12:43 +0900 (JST) Received: by relmlac2.idc.renesas.com (Postfix, from userid 0) id 927D82806F; Tue, 31 May 2016 18:12:43 +0900 (JST) Received: from relmlac2.idc.renesas.com (localhost [127.0.0.1]) by relmlac2.idc.renesas.com (Postfix) with ESMTP id 8B3AD2806D; Tue, 31 May 2016 18:12:43 +0900 (JST) Received: from relmlii1.idc.renesas.com [10.200.68.65] by relmlac2.idc.renesas.com with ESMTP id UAE14780; Tue, 31 May 2016 18:12:43 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'";a="211981216" Received: from mail-pu1apc01lp0015.outbound.protection.outlook.com (HELO APC01-PU1-obe.outbound.protection.outlook.com) ([65.55.88.15]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA; 31 May 2016 18:12:43 +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=DbbNkHS7jKVaQ2a9Tzt58Yb88Z3PbzDSEz5rfKUckaQ=; b=nzqOaueXmal1wBDobbE7Mq+Gc2A3wut3EoFg9VzJGW5Id6C4IhMjZxLaJroumSMYYOsK6UaPb9HSBKS93jwc8LbAoeU48dY+jo2hPu2Ih+j4Y/pKGVZDrDifUZiugcyrrjDjXS5yNQCWtjYECWnn5k4s9wYTAIIW49Vxlad/j8s= 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:12:41 +0000 Message-ID: <8737oyr3zq.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 34/39 v2] ASoC: rsrc-card: use asoc_simple_card_canonicalize_cpu() 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:12:41 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: OS2PR01CA0045.jpnprd01.prod.outlook.com (10.164.161.155) To PS1PR06MB1705.apcprd06.prod.outlook.com (10.167.53.15) X-MS-Office365-Filtering-Correlation-Id: a6ecce86-30e4-4ba4-4b21-08d38933b855 X-Microsoft-Exchange-Diagnostics: 1; PS1PR06MB1705; 2:UGRpyOQv9nVWnUi8mruvohDxkhpNwzxtrooDWE/soB8o5O9cz7+c3nYzpz3pmJCyneNYOITfRykGUOIijuT0aE9I+jsKkBl+5bKQkKwstrEmTymzT6RIU8t1T4Wq3qMxVZZ/k6crloe1rbTQwK1rNKQkLW+mVEpCBJpai02tQg9XkgSIAqb6XdGfAXNwdwzT; 3:1psWpvSiXIdzToZM5+YAjulJc81KIVkPX4heV7PVHspxsUg9GYa9iGQbPkhPMPhWf1MpDd+0GqN2UImqe/nxwXHV+kZK0ZShUSkyRLbsI54YoOFS5B0t9Xg9EHg337dj X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:PS1PR06MB1705; X-Microsoft-Exchange-Diagnostics: 1; PS1PR06MB1705; 25:N5gesHi7+q/0YNU77c75m0Nwy+vNMCcc795GRvo6yTAJ1QLy06kz3Jov2JpaLy0PRQ5+4ZZpq756oOddfgFSP6G+SnieudIA5HPVnRT/oU2OvOXHnR0zfsAmh8r54o7J1r3F7BeqCvxfW7e/rEcVtgGNEPP4q70cMVPVA88OGH0A20z/K76Rhx78tpG5JpwYm/NqSu9bDMzhlrdYv1JpI0iczHtu0yo4cuANzQCXGabZVSG5tiKfhEqAA+tHB3VnTO4INPpsPKoxiCFgMs4z7hlBP1We5ZPMgdQZ4YhnpSuoJT71JncPnV7HoHwL9QubhBvFm1A5aByrOjVCUBJM80jKMtfvvDsoga7kBNgINbgpoha3eqLcylWfBPTzH/KMhxwS5ocVT+sF3uuM4S7NDVfkfRVwwB4cLfvmuFk+PSaNGAqK/cIZ/MRffSgUAm64lh/SZ5DMJepxOyoaG8TUvChq0HGd5xFNkv3VNKK24eW4xgZu845hSJ3DwaPyIc+FvffpY8QRh1me8M52Hz9Ss+XLU3dNIbzCI9Mpg5D4gef4pEK1dUfFHm89UesPUBakZLf8VcrN9GWegpAH/O4Z1MD9/RRKfLHzaQrX67mOTVUXZN/78xqosg4TG9v/Goxltya5SLf82/b4nJqo5JeCroLMXsC+6NH2ZJo5VcObx8YKJjXUt8PTX05bC6X3tpUM X-Microsoft-Exchange-Diagnostics: 1; PS1PR06MB1705; 20:0o1lPPXHdWJkhF22uDmgw7z3BgO45y8sxyBTpmFYos5qJabNK6hLsQgOVeD2d1NA4H/VZ6fP9ZVvvrwCy4inzwAJdXvZwgC3BRsz8OJ4dmA4ebvhWSh22m7KGCsWN1YxOMTcCoyCG1YybXAohcSar/zwtkcS0sxzSKT09ugkkqr8seZdOSTiH5fhCIEtAZGtfRArPaKTCco3E8AGbzLWraA/UzJmXy2J59zuX0biiHAB8kTuVfQ4lTiGKlLqd1+nccatVNWlsl5M0qejdbPOPXhf9sUBeXGZSqMxkTDVQFGwTINmPLvT/FW1F6GzTIqJ/sbPhVoFi9SKeqPjsY3r9LqeNymBtFU3jf7uvDQ7nzL+haEYk1IAAEosWW3XrkspHWmkEOt0BFzJqDRy37ecmQNoA0MpJRVaUu/Hk6tFG87kdG+epGt77Xyo7R5HAdTUY7naXUfTbGMhUvHXFnUCfcQ227JySirXvdAMzBFre5nY+Hudp2ar0U4k/E8W4uHX; 4:A4dP0ZUXHBOBfIdGF2GBuv0FBGtKqNsLdQFPsZ9e7zRDCG5qMP+CtTQG0O7FiMvaA6lpmEE9nN6y6j9ec1VmVt94pSrJI5rkNeNvbjrFrVkW+pcx+aOXLbQ21iNnaEXNxUojhDiPDVKekCp518R1/USm26mTcZMhxnhkGkH0sfdG6ZOyaeZPRMZFhkMsKjlEuTAmoenGevc3NXsre6SoW33xc6IpG5yqA4+/vM71AfDe7eSpmofyQSW2/tO4uXFn3WOakKjckSpsquORwZdMSFTnv/GOdbV21TtljlspGIFrZnPEGpfXcRd/HDzWIftseA4iTpa1pUsz8jNWOT07gVjWkaVrtF8YbQxSlSLxnOXBEQ19PwZFKISQYCMXReUoJAPvhicxmjy7pJgr7a2iTw== 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)(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:wdr23al9vs95Xc48lbyHwBg4gXIJiIm770GbU9khf?= =?us-ascii?Q?o/mGf2QgT0/9ScwV+UXsPEKuq8Cr7MNAyn7MeUO8QuILcO5pUcTL70Z0hZjB?= =?us-ascii?Q?bW7APQuCnL2XPDYPK4kmWKFk4jCKh8wSHR0XjWUr4ZLgwTKMwNCEsbMHu1qi?= =?us-ascii?Q?eptDxLTVEuhmt8uQ9PMsrdcRpWwoBeA9qekBcuaXgn0J374OEEXBG29cr4TY?= =?us-ascii?Q?ggBFpdE8Ds0Ip5swzsIXxkj3WZUPlPOhxavt6AbidiSBgg7rkFcORKsvIKD/?= =?us-ascii?Q?ABnjq2rGwH4eDRZml59uYXMsIEssILRYwWh8eteOjIPijC0ZTJbOLMZ4wHVk?= =?us-ascii?Q?laLqzrUUb/Ijazlvk79fCS8gSPwvzUof5KQZrkuAXCdRQ93L1wllMK2aklff?= =?us-ascii?Q?6U0IHp6KTK0GMHE5PsXevkKre2+XqyTY3utra6MUh2a0tcrDLEJvfLOPyC6F?= =?us-ascii?Q?HuBRbLOZ+faJ73DfAUVhBeHrMwEnVGHJq8wMv7l97bb8MzSsFjJBJMciuI/z?= =?us-ascii?Q?CiMP0VrUoFsjzE6/50mgWfTPLhB/bxm3qNMvV6BG0kgQ0JW0SNQMtxAcvD1c?= =?us-ascii?Q?4AFcSlAm11xsdDHa6XwLOml1+X12e4VdQ+rCKnMEV7TfKQwnNCdRTdJSe8Kj?= =?us-ascii?Q?FCF582xKLsIiTIv8N37ToOVsMelYtBU9k5IDL130I7IPN6wEULeyiWlqgm11?= =?us-ascii?Q?5GIwJdnrzm+jTaw0OMw97yhTSndoPJqPJoi07/kwwzqneu06AjYrpXl5HEvI?= =?us-ascii?Q?scA949CHmfRpUNOjaKjcWrMDFyw8M+x2zQ6gDRSDCQNf9ZhSdChV2UlWK5/w?= =?us-ascii?Q?C6DOXg/1HURloGThdybfScPIM79grDpks3c3EZgU43dej6KiHWsUvvXLrzG2?= =?us-ascii?Q?l54SAsDrfNtJTFtjl1V6RwopNenWMH3m0azkEA0NR6gzZmc1cmcSi1GG4klZ?= =?us-ascii?Q?RXlWe5tyD0PyzRiJekAPJb9lD4lSrbstxB7RBvxKw=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; PS1PR06MB1705; 5:5NkiuM0bv+/tKiF6hUKOf/IeesTtJmArMwZYg3sJpYTETcWyThoI9ReSbZeX50x6fLU6lecsPIn/+LO78DfRJRgvTnq+Lzco7oaRmMykj/F0mDfAFzIkoc9Mihd5Tq3MRt/U5D2VKpOJ2w/TI6djsA==; 24:GYDCAIBL1VTMKg+m2v39RZTgMrBXOuO7Yw7Pxhvvp6Iscw465tjYSEZaEjdWufljihiVjicPAy3xBqXxe5m7EkkfytWwEBHAC5wCMR0/It8=; 7:66BvPK7gWizBQqp5vZGd+ASjMllbrVjSC/AsxfV2NorH3cm1/mWI07p3dGw00Zo/oayauAXUHSQHXWRPNFdk9BMOEAnReeRAFX2Pr0TGCZP7H2qdRcSTbO1ijbwOfhWYDhM1l5NGXAzIMTKo0jLLoIDvpu1+f1aSabJVCgW/rjWR7IwusmLWTW1NJbgYQZC4; 20:OaAIeRmn9opc3qrqNfGpCsYSu0iow1GE7ed5rKR6p42vhtpBv61uNRPLsJyBRkeB4daEq+DG2tRY3S4DTmJQaKYFopfiOAdmMQtWz7o6omliLKvGkoQI+goAsmOzbS+Y6NVNYaAFC7l9P0c0yoVBMGaCbpmOVWO2H7hCiNgCRJ8= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 May 2016 09:12:41.3619 (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/sh/rcar/rsrc-card.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/sound/soc/sh/rcar/rsrc-card.c b/sound/soc/sh/rcar/rsrc-card.c index e5432c1..a452150 100644 --- a/sound/soc/sh/rcar/rsrc-card.c +++ b/sound/soc/sh/rcar/rsrc-card.c @@ -156,17 +156,6 @@ static int rsrc_card_parse_links(struct device_node *np, if (ret < 0) return ret; - /* - * In soc_bind_dai_link() will check cpu name after - * of_node matching if dai_link has cpu_dai_name. - * but, it will never match if name was created by - * fmt_single_name() remove cpu_dai_name if cpu_args - * was 0. See: - * fmt_single_name() - * fmt_multiple_name() - */ - if (is_single_links) - dai_link->cpu_dai_name = NULL; } else { const struct rsrc_card_of_data *of_data; @@ -222,6 +211,11 @@ static int rsrc_card_parse_links(struct device_node *np, dai_link->dai_fmt, dai_props->sysclk); + ret = asoc_simple_card_canonicalize_cpu(dai_link, + is_single_links); + if (ret) + return ret; + return 0; }