From patchwork Tue May 31 09:08:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9143907 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 68DA060777 for ; Tue, 31 May 2016 09:08:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5C2A627B89 for ; Tue, 31 May 2016 09:08:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 50BF127D17; Tue, 31 May 2016 09:08:29 +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 E357927B89 for ; Tue, 31 May 2016 09:08:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756749AbcEaJI2 (ORCPT ); Tue, 31 May 2016 05:08:28 -0400 Received: from relmlor4.renesas.com ([210.160.252.174]:63824 "EHLO relmlie3.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755920AbcEaJI1 (ORCPT ); Tue, 31 May 2016 05:08:27 -0400 Received: from unknown (HELO relmlir3.idc.renesas.com) ([10.200.68.153]) by relmlie3.idc.renesas.com with ESMTP; 31 May 2016 18:08:25 +0900 Received: from relmlac4.idc.renesas.com (relmlac4.idc.renesas.com [10.200.69.24]) by relmlir3.idc.renesas.com (Postfix) with ESMTP id D4186612D8; Tue, 31 May 2016 18:08:25 +0900 (JST) Received: by relmlac4.idc.renesas.com (Postfix, from userid 0) id D206B480A5; Tue, 31 May 2016 18:08:25 +0900 (JST) Received: from relmlac4.idc.renesas.com (localhost [127.0.0.1]) by relmlac4.idc.renesas.com (Postfix) with ESMTP id CAE00480A3; Tue, 31 May 2016 18:08:25 +0900 (JST) Received: from relmlii1.idc.renesas.com [10.200.68.65] by relmlac4.idc.renesas.com with ESMTP id UAK07947; Tue, 31 May 2016 18:08:25 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'";a="211980903" Received: from mail-sg2apc01lp0248.outbound.protection.outlook.com (HELO APC01-SG2-obe.outbound.protection.outlook.com) ([65.55.88.248]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA; 31 May 2016 18:08:25 +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=0sewZ2Nn4spqqPu3WVl2bPhgr/7YaVngBDt4D4uvEow=; b=O2IUsKbPYVy80Qq7dESgVLhOEbn3644dBRrbYFbcZqPNy/GThhjgo1ALsthH21vKzFtQOxvyQEUat7urDStKhOynESdrizrdQZ95jRh60+g0jQpkIajDOBmCdEQefVfNxZ7jv3aakY5U2vWuT5gWBZQC7gyz9rm2VYRF/gAzI/8= 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 SG2PR06MB1712.apcprd06.prod.outlook.com (10.167.82.142) with Microsoft SMTP Server (TLS) id 15.1.506.9; Tue, 31 May 2016 09:08:22 +0000 Message-ID: <87inxur46x.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 23/39 v2] ASoC: simple-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:08:22 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: OS2PR01CA0088.jpnprd01.prod.outlook.com (10.165.51.176) To SG2PR06MB1712.apcprd06.prod.outlook.com (10.167.82.142) X-MS-Office365-Filtering-Correlation-Id: 848dcd53-07c7-43c4-997f-08d389331e52 X-Microsoft-Exchange-Diagnostics: 1; SG2PR06MB1712; 2:L5Mc5ALLQPkTaPgNtSadQaBPMhoJyNRRRHWmb4qZbrkHJpizOz3XUks/hc75O2uP43gZFYof6+rCgrPG9JaAsunoui1b/iWamRXnmYUZ4VayCAnXNt1YYcIUTb8E/zLVjE4XDRMTQrQVjeaxxKIcrMbameCKreze/xNVIK2/7EtunviIQOD3/qhLD45ePUxR; 3:nDgd69fAaMkhw9+1fF/lKbT1CFfSFSBYRDH6I4/M9uiW4otYEsb0/ftBsEbdgTZO6Udu49sy42ocwwRPlg30Gib7VaRg0G8R6CKJg4BMTGF4QF3l38uR36cq34esh0ga; 25:5EFKenXKeOUheXxkx9corbzJB1Egbj0Ff0yJBP2NHxR+aURwqvp4Y2pGb3zoN8MWl5KzK7xitZSHINzLDoVG6fS9yblo6Epg/+UpzOd1Nd/pgw6s9AJh0OV86FnjNyv5F62DG2ZlB9lwMgyTx/Lc2MQwnXeAiz5ntfP1yLsxOHmq/K1XlC3g0IPCPXOS1zONMfSsikycDUjc8gTaDZFucQZlgNFoAaTEFqkvJR7AMLvqrNPCVw6PXSeo/mCkfXhRoPRdBfbi1i5LnXolK2KdOivdEX8h7umuVcyVgqxvta89w7O8oSyGpsPE1PqwssxbKWw6IdlPq/J2eRAf6TW1Il5RiTE99xttPWMFc2aD31LwRMsk50spn3wAWJmzfHcOqpKilO0u1zdlBJvPo5TJXawZpBIbBsId+RBA5AYUoAc= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SG2PR06MB1712; X-Microsoft-Exchange-Diagnostics: 1; SG2PR06MB1712; 20:ick+Jdk7WuNLkFQESNyuWeK6C6REIWDa3f7e6Z9/qTiZh4yty4iQdcJ9NjZJ0WV/GdW+oTD8oB1INkPJlkXUn3r2WLgBnrLnb+rxwjw7fz3vhiyaaZfYNXe9N6bM8yh3A71u71Qt5Jkta4T7pfoDxTqU3Nx/I7h1t79JYAYYHKdYoOE9wNzMySYEoyGiBRFgraiKnecAMptWzrvPbSMmCu1mYjwtN9iEosi1pjbo73qIKu62Hjktc9vGqH+MdIp+ofrxmpkJ8ytog+C0VJsguqWwqQpOXcbpaJs/Psti4ZbqHT2Xs/Z1U6VgmBPcnXBPcjBzlc7DFkLnSZGMGik3GFFTW6RBKrcJ3z4SlKLXnJF9QtXteKC3XuvtJavPQjLxIkchXb93yF7tkskjX7+MGOoWAy9q+Wj4BxWThhgs7whCwIGyCSUA8feSAJKmzrojDOfvsi8u9T81YSwTYX2kF/Mm/JVi3JMOZTfdWS1PVIDW89EBYc+nXu+GZ4gisBaF; 4:sWJmOBTubcSB7H5KSnj/dXyKdUnVkE8TeGltyJaB8ThJuaFUKL+7cdT0PXKcm3vGcCcpWcMzq5IJpISsOCr/FY4GBQj+AcZuqLnIX6HfdkdCC2QjEiDcl1FbuVGECVbl7O922FeceEvyfS1wtLZ1HDhQyC232+NLFx2rQXSCy0H21ZGf5yluKYbdatRlXd8pw6RJa1Dkovqdw5M7aSn7bZ5oizXlCtLMaYnq2g2ppFg8oCZj4jZzZ63SgJyVo0RbaTnHp2QzIUOW18jnJimxmQGRTNhh+4xr6OkDp3zfdBndqQ4Fn+nCbimcV21O6ZeeVrzmJ0ssYs+KgQIkwVTAT0Iuuin4Nk1KxDCYnK2YDJrr9W6JmxCqfN98uGDnmSg4EVdoXRGjdEPhigkS1aGkOw== 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:SG2PR06MB1712; BCL:0; PCL:0; RULEID:; SRVR:SG2PR06MB1712; X-Forefront-PRVS: 095972DF2F X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(66066001)(47776003)(50466002)(3846002)(4001350100001)(76176999)(6116002)(50986999)(586003)(2906002)(92566002)(54356999)(4326007)(23726003)(110136002)(36756003)(46406003)(189998001)(77096005)(8676002)(229853001)(53416004)(19580405001)(86362001)(19580395003)(81166006)(2950100001)(5004730100002)(83506001)(33646002)(5008740100001)(42186005)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:SG2PR06MB1712; H:morimoto-PC.renesas.com; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SG2PR06MB1712; 23:kgRwauF3kA/jgC+vIcPdK8JdH8lIUyAaIS2prU1Dn?= =?us-ascii?Q?tv1xuIpj7h0HBcqH/AkDxcf1QjfQbPTDf3n1cIqvLUFnCUeXeKNrkKV9AWBr?= =?us-ascii?Q?PLMZWlUpqMbZ8rjJkdsQyZ/A+NW5nqcj9d9Sq06zY421UBFiQo6LtJBW8tcM?= =?us-ascii?Q?UAOaU9DnDz8oPvHSHtDepKquiTWBmi0+h+V+HHKEGEJ01CgTc8JSYoAJCZi7?= =?us-ascii?Q?KOfyn9jpPzb0l4YHW+NrtJK5ugtxHuTk6MzPvT2z9hQRPeWr9nmq/QOa3D+Z?= =?us-ascii?Q?1m1o9Ri2WZNfpLdYj6nBTmC33A8qkaJ3VixE4wOhFKPRfY71FVvcXKatlHN3?= =?us-ascii?Q?JTZaJJ16HTSDcjwN9b0IEUOM3V1KRJWw+LrV2KqdyQQ6BjP7SCoZvSPCYBt+?= =?us-ascii?Q?lKjF4yU30ryT2GkehsslqtOPNmMghVgGUKN6PZCQbW/CeSxx6A8WwTeZbS8Y?= =?us-ascii?Q?8S9ty3XGTtYbAoLDjV8VRwgA9ppwwuMPZhfGhCvE0EGxBHLjhkVTSakzGJ4B?= =?us-ascii?Q?WMFBYbzOyuFLCPx0GdOziY7GKSxKnhIjbZ8Zu7BmEIyOP2hI0syPMG3UQkMX?= =?us-ascii?Q?EFplZvGh6KfnmtoaqDrNGOBiehlogprrMG08A1fy8crvkNNfzz5rzsiRJbeM?= =?us-ascii?Q?MXY5jweo4gZbGvX7TVlTfGfIFLFecP4Sz6ETD11IW7pc5loCSKlaJiJcCZP2?= =?us-ascii?Q?EIMb2pPsJuYujFeJu3DtRVvE2yVXcW1oH//kF/LnVeAsPP4NT/meDS/BJJ/U?= =?us-ascii?Q?86qdhb++tDNQ6ganT7QXO7wWwXAJDiiU9dw0kYdOUl/67GCYqiA7U065GkKn?= =?us-ascii?Q?nCdIUDpHVCuUfNpO724QJkf89gmbDJVXgi9npF0h0/rGPC93dD+4Gv5akt39?= =?us-ascii?Q?B2D1BLwUd+KzGscy2RGK15xN817ovHfQmJID88uwCQ0wiz8ukhSOGKcSOl/K?= =?us-ascii?Q?QWjjKFhRqfgLjNznbPQHAisRFiDOikLEs2fOEjCDA=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; SG2PR06MB1712; 5:Z9le5/n9NRckGDlhtmldr9mi+EoQnVT/5lRoirireuDZwyOt6e4O1a2fgUHdXWudk4PSJYPWBSqf2Jl2xng4+kKSJkZrXPevReWZYKdXal1w+xLyM8fGxs0VkcQKjZOc/oVhyjYF6WYEAPQGFIyt4g==; 24:xnyQ43ZNm7e1/7/g0fsmByPzTeu0CeM5JVnAZOtCwpoph+QpL2W1W1ICc0UMkZ2d17p2QwsQkunlEMXHZUUgxPx3imojFHtnUIvDIFtir8o=; 7:+eWwfRJw0BcpefY4gXliu8kzuEDpmSyjXMsB34bqTVWLm04rGrOA3KXLW7ys4vlpi/zVcO+d09/jqnqhD5BDemyGKGnoZAxLcLcmkGWC7Z7GZ5xJnbDuCgXu4eMNLLMrJRF4ct5fD5STpzeN3kT9k3wM3fydsP0UA6nnaW2Lg66v3kajbEoU8mY81F0Bs2O0; 20:g/tyQixQTJ8w1ldXYHOOrAVNE92/ZfcAOtwGU4P3e6tFfBZdIJZ1jDkTwTB2F8wlkPCd4o/aLg+azEVgfoy8wjudObTd+WjOTSUoDqmAc/waJaafmNbYsGE5th8p5ja+IKEakKEWVklHPrVufE127TVVfPCDEDXZFld2RliOstE= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 May 2016 09:08:22.7876 (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, 3 insertions(+), 11 deletions(-) diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c index 11fd7de..c9178af 100644 --- a/sound/soc/generic/simple-card.c +++ b/sound/soc/generic/simple-card.c @@ -300,17 +300,9 @@ static int asoc_simple_card_dai_link_of(struct device_node *node, dai_link->codec_dai_name, dai_props->codec_dai.sysclk); - /* - * 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 (single_cpu) - dai_link->cpu_dai_name = NULL; + ret = asoc_simple_card_canonicalize_cpu(dai_link, single_cpu); + if (ret < 0) + goto dai_link_of_err; dai_link_of_err: of_node_put(cpu);