Message ID | 87ziolgyn2.wl%kuninori.morimoto.gx@renesas.com (mailing list archive) |
---|---|
State | Accepted |
Delegated to: | Geert Uytterhoeven |
Headers | show
Return-Path: <linux-renesas-soc-owner@kernel.org> 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 94816601C2 for <patchwork-linux-renesas-soc@patchwork.kernel.org>; Wed, 10 Aug 2016 02:20:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6444F283E2 for <patchwork-linux-renesas-soc@patchwork.kernel.org>; Wed, 10 Aug 2016 02:20:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 58C0C28402; Wed, 10 Aug 2016 02:20:52 +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 E349F283E2 for <patchwork-linux-renesas-soc@patchwork.kernel.org>; Wed, 10 Aug 2016 02:20:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932611AbcHJCUv (ORCPT <rfc822;patchwork-linux-renesas-soc@patchwork.kernel.org>); Tue, 9 Aug 2016 22:20:51 -0400 Received: from relmlor3.renesas.com ([210.160.252.173]:12235 "EHLO relmlie2.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932654AbcHJCUu (ORCPT <rfc822;linux-renesas-soc@vger.kernel.org>); Tue, 9 Aug 2016 22:20:50 -0400 Received: from unknown (HELO relmlir2.idc.renesas.com) ([10.200.68.152]) by relmlie2.idc.renesas.com with ESMTP; 10 Aug 2016 11:20:47 +0900 Received: from relmlac2.idc.renesas.com (relmlac2.idc.renesas.com [10.200.69.22]) by relmlir2.idc.renesas.com (Postfix) with ESMTP id 72B7B468B4; Wed, 10 Aug 2016 11:20:47 +0900 (JST) Received: by relmlac2.idc.renesas.com (Postfix, from userid 0) id 6A5322806F; Wed, 10 Aug 2016 11:20:47 +0900 (JST) Received: from relmlac2.idc.renesas.com (localhost [127.0.0.1]) by relmlac2.idc.renesas.com (Postfix) with ESMTP id 567A62806E; Wed, 10 Aug 2016 11:20:47 +0900 (JST) Received: from relmlii1.idc.renesas.com [10.200.68.65] by relmlac2.idc.renesas.com with ESMTP id MAJ05267; Wed, 10 Aug 2016 11:20:47 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'";a="217090475" Received: from mail-sg2apc01lp0244.outbound.protection.outlook.com (HELO APC01-SG2-obe.outbound.protection.outlook.com) ([65.55.88.244]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA; 10 Aug 2016 11:20:46 +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=iqFoFVv8FxOtup8mMy5SboXGIH/Qua/IwwYNGAqdrws=; b=W3jvt7YZLOWarhlFAxLujSEtWzEhkNgNWsjoCIzx4bsDjQLdJXnadorpHkvP2cgLVbeIdX+j0VyoxVigsyVxadp3NOYtNnXGofoQ1SXLpHigiaHm4QvcdADnh3Pap5NsXRqpe5yyz6n0iLJNPFCo+HCdpzRidD2soVGrqYLYEvI= 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 HK2PR0601MB1443.apcprd06.prod.outlook.com (10.165.182.149) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.549.15; Wed, 10 Aug 2016 02:20:43 +0000 Message-ID: <87ziolgyn2.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Subject: [PATCH 2/6] ASoC: simple-card: use asoc_simple_card_canonicalize_cpu() User-Agent: Wanderlust/2.15.9 Emacs/24.3 Mule/6.0 To: Mark Brown <broonie@kernel.org> CC: Linux-ALSA <alsa-devel@alsa-project.org>, Liam Girdwood <lgirdwood@gmail.com>, Simon <horms@verge.net.au>, <linux-renesas-soc@vger.kernel.org> In-Reply-To: <8737mdid9w.wl%kuninori.morimoto.gx@renesas.com> References: <8737mdid9w.wl%kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset="US-ASCII" Date: Wed, 10 Aug 2016 02:20:43 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: OSXPR01CA0080.jpnprd01.prod.outlook.com (10.167.144.47) To HK2PR0601MB1443.apcprd06.prod.outlook.com (10.165.182.149) X-MS-Office365-Filtering-Correlation-Id: c7c8f4b9-9b3e-4675-7a80-08d3c0c4ee76 X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1443; 2:pqwOhpdKepwXIGC/3Zm5gLTFkPZ1gR54xZXeqLFeyrQIqlHqCbvBSLazS7Si/0QmsY5b2ZBsohdJpOS+zB1paGSCJbMjhkAEV2PqOgs/+fKJOUYL3E0kW+MEgGqbd04chOUZ0nPsGdro6IXbn6AM1cBgQcoPtAuvxbtuzInU4tMoFvy3r4MM1wf8ME4IvTQu; 3:KGTydsfToIj7mAlAKmPJJ9EK21yfgyOzgG7yS7XbPcugqxBlhDnPIvFkhAQ+d/b7Y97yoj2r8Bk0Q1L9ntEwlB+nBw3Y9u+47lg4IXY6rkNBAYXG+u1FO+8KbGrORT63 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:HK2PR0601MB1443; X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1443; 25:Ze0DgUBMbgL1BwVDtsUht+w8afIdPlZ+QfhL/OgWaDvOPWmUzqdyy7xPT2M8bgUy06G5qtFVNcj03iT8irm035dZ2ey4XaQMS/W5Uvz/skMu/qSrlRlV6YyhDgrAa2oKxJl35QiMWYS+UdsV4vVOz7ba+5iijFifHl/VF0MDEk/thEhuWowMPCAgP3AgBtggWINoHSwBTaI11o/PpAl9MArk7g0nz/FyL93oJhKVUz667rVQn2bzx9qnqLo23JLtpsdL5DMO5F8fNXNOrT7J0sg81NXFGATgQjxT9X0hShquBm6rQoaBj9zBtu/Ddo3kQWh65VO93SupF6XehXrkFxDxv7p/Tdimh8g4deNzlYA3WGPY6uniWZSFwlntJ5QhGs5B0L1w/ehbbsDzYtgZxy8TrPcw/ahTnTxak3LVLQqQ/i281Vk8lmFkEHCw2VIahKlszqSyRe4E5fk/XlsC0yCXOi7cjMluOdK1UdQMgdcyGX5e6RmVAXTHfUdc8W0MFUwEeLoWcv59HbtvW8mXOsO5Zt4iuxFM6iwvg2mYV51kRNCaU58MqZ+qn5t4Wew+b1Ve4YfNStXgcZeNsnbTwMTOdVBeWTHwmVUL0G/00KAwEgZYNO0/rzmu7FM4wIFP4JoAoFmh2a+bFgiifXOrP8DWP3iKyEr7t9HKGsz38mCv9Xqv0je7YdUvsGuV41gHvIqKwPcFlOBdnzkwRkDgxQ==; 31:CRkBKejfs6IxJKVu1v3xCQB2KoZ7b4N1ARaBhmmvyW5gOIeMTCCe6Z3VBRxFhujtXfx1gNgrHTIVry+hak7/8FLjq0lCepel4PBi8VfvGYqVZCqJ5QFsiSCQ1GVAhDCGl7eqhcbqmmqWhUwGLRnZoLmwgXK9v4l8i02kIrJABGyoL0Xht0CQzV6k9aQK0wurvcXFxWkiNW/ 6ioTIV3GdPAgvkk/cjQ/GqLGOG79vw+I= X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1443; 20:pqFFjproL6SPzEC2mZY4dB2cArlZ7r4cTE15S/8u8tzJT5SSVmJyvb5MLK/FJWiOovsU/YVqqP8/sqRQmN1PH2127ywGdHMDbp/m5Lpd6gpjW2RC73kwKG2GmDrnKVyYZnQ5vPUe/F4R2pxVzNqkGz2nJG+cXhCicWVHNjbFe6sd+k78shkJDXygr4npXqbAYym2Fp85vbwwrcbdn/dHN/USx5vnK6DVt1D+cpSa1mE6rHVbMY/HW7zBxUDu7gvp7duf2frR8mVg2/Hypi4S6SafQ2L1p5W8+naNq6UwxeI5P9+h4MS9p5sXmhLq9Mug4CntFGABFXg7YeBLrkzcbIy4TQIvW3seNL4WZX73x9hPvMS1ISx36mksCGVC2OZDWILwhU+0NTAp3fE3TvNHmhBvfg5texBzgnhJraTlEuMRQXNEkNlxzLfo45bWSNNM5OmFxvnnZxd0EXehcXT9tCsC6MrhE9V3LjZpEVpGfEG5vAGqRjNUCsAQqzlWGpXy; 4:aAo3yR1t7DKAo4PK1AT2YeWuSsGDthO5b8TjeJmwP463wlun1nYPOyZYS46zcfzB+o8y7DQaF2woLZk/38UAQIgkmdCSlDqgeC8HD+up2RHykeEI2Dqw7Io+UbiERfq/eBAOqePIyqHupisrBPqaEFq442LnWeblFQuWONysFu8H+XYSamrYxDzcj7LxA+n49Xv31qbl857C15Xfx2deWECdp11BkU83oZKdQWjPO6e6+p35/Zm0ovLj+qu3RS9lxPddNQwrSBgdgtlWoxZvHKbrdYxn29kaSqiaPi7HXwyVu6Gb71NioAdCUJTVbVGnMYVDkKYEPImarDygWzKcGX33M2mIdqHkriA4GlRUw6tkPd7E+K/11G+5+QeSbTrN5dGQ06fs54grZS0fEqiXYw== X-Microsoft-Antispam-PRVS: <HK2PR0601MB144309E73808788DEDE81E47D41D0@HK2PR0601MB1443.apcprd06.prod.outlook.com> 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:HK2PR0601MB1443; BCL:0; PCL:0; RULEID:; SRVR:HK2PR0601MB1443; X-Forefront-PRVS: 0030839EEE X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(199003)(189002)(305945005)(105586002)(46406003)(54356999)(106356001)(229853001)(7736002)(19580395003)(2906002)(19580405001)(110136002)(189998001)(33646002)(4326007)(77096005)(50466002)(83506001)(7846002)(50986999)(2950100001)(76176999)(68736007)(69596002)(586003)(81166006)(66066001)(86362001)(42186005)(101416001)(97736004)(92566002)(4001350100001)(23726003)(6116002)(53416004)(36756003)(3846002)(81156014)(8676002)(47776003)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:HK2PR0601MB1443; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; HK2PR0601MB1443; 23:v1towE3FRUHQV4dEwBestc+XYzcLVkLXz6AisMX?= =?us-ascii?Q?FiX7zQ93nWvpFxeco7OMQjXjoynbp8IC5BCgpTrYLurx9rAI/P8ytiCn19Hk?= =?us-ascii?Q?rYYqxZIkh02A6I5PY9J7jhT8wiNwuVCjLPZUHPOOaYalzv93oXOvIymERkvt?= =?us-ascii?Q?/T5bFEx9P2xA+iAZvU9fQfc3KU0QqzmsBKgNUYL1a1piGM9RwZ2I9IFGYoOo?= =?us-ascii?Q?UNJRkelzeyTppsGy3kK0nM32Dnem4ZNzlwbaatbfv0VU3k5NMb2HXcdY99GA?= =?us-ascii?Q?lIZ4Q5QWqyY5uTZDqNBwxOr2xmi8tjz2q7+6uXuP8ZIXqUqx+sNgLYLTLmfA?= =?us-ascii?Q?4Higy62e3hF2lgC+5R3zt+ui4J+IEK8KiKG7lzV2yHQJjHcsP66+v0f145WA?= =?us-ascii?Q?2ED7ODZMwj0q0eQGqIxCXlTxE5Br8QXcJu8+XrnW9PEDFpfbW092FALzwv50?= =?us-ascii?Q?qkGiVMnBJ6VaAiGUPeukMjo4X2ImDjfPxUOYSjqim92QIdNwBhW2WRf60YK9?= =?us-ascii?Q?77HKCB6jYVzOHrFquReHAuf3fLzC0vJhfK7v/LmfHrplmUUS722EqfR1+bbH?= =?us-ascii?Q?jKiJWromxGlVJjvVZcqebiYyhN32bLEyjB2prIWxaZhR6QtzjHjsgXOq3bIU?= =?us-ascii?Q?9O6tX41P2vvxxaaSIBhk1o36HQ2vr18op7Ugpyuth4vj5qEOVCf9edAy7FT/?= =?us-ascii?Q?uK1Ad10X3AGI8PAC+7PW+tT36VynGZ3RiNAyBvWENyXYr8LQ56W1ILNnG/BZ?= =?us-ascii?Q?iKub4tbsl5Np49jT3mHDkMHmH+uOiZGVMOxxat2Qg7IR6IR34kpKirUaIAz+?= =?us-ascii?Q?xBOUzzjrw167OYqEv+R0u0LncrUvX79QJPbk2p93jDeOJ44WHeRoRWjZNpks?= =?us-ascii?Q?wTfG51W8TlTbOnLEW4U/fcmZN8Q+rBpaq7rJaHQwPRFg9kmIo+GElLH/eVhS?= =?us-ascii?Q?bXO/3aRDO+ntOCgSqkxCAYzzZ9Q7OSl5O5XeyhhBb+grzsPr/QtXnHVMio/a?= =?us-ascii?Q?IK/axvHKG/rto4oV1qR8GQ/nEojb7LvpgqY7WgpsVcGtqWYGdbH7431UsPpD?= =?us-ascii?Q?0eDGTEK8+SkGl3fp+8Lx+WICyxnLvi42wD67vZ1JT57bFMJ4JKXqJ1pxVgH3?= =?us-ascii?Q?FmD5dCW16qW7LeJ0/rhajT0cgH9m/s16hSXgdunpADChXPRDc0IxrGw=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1443; 6:ARz9pWx642TbHGWps8E4HMsX8PtYPIeHyUlv2t/ws0x9Ws2K4fgvXlAatghryFWygafxGIHOxND4reZ9Hz2JW6jSC+/NelsRNJKifmz9U9dSUVINZ1jx+gjxLs831nIQf9IjUaAhBWljSVPks5Dj/dGhPv1nOj6DmH2j/ABYxs5aL7tzgOomHPQBDOfTmM6dcqsGUTvPwDZOVmk2z5XVdLhyuXJxn4DU/y0Evuwd4FuvxmIru8BJNjuIMvv19EhxPXm637pENygBtNbttk3G03Khg10Tb6qCrFQmAND9dm4VGQ9N1Mz737kV5y7mMsfd4HZcN8Tj6iU519heWLKnCA==; 5:CjP7nq5Nx+mD6k0U6fRDrT2N+MFpqLZrhY5RhrfqdRT2WG1F13ap/G4LJZ3ER23aofX9jpbNaiTDojBWEfhEs+GBW7rSIkVurfV9VS7ZX4fp/Lsc4dgncsUR2lhBpsWq1SSW1BQVuv0wfMVFFdGQFw==; 24:SNgO5Pslhw0iLYvrjPQ5bNklu3nvJ7JVJzAzOKzLErdj9d6hb8F/UDK6lGhQJKS+e4W4c+qRWtr66oXk38Fxa6BXWHcnd0ii/HF/T78ZyqI=; 7:YT2yCEa7tUfm3COohM2bne8WSmD5BIOAZbTeMHRq9woSpYZ8npex59abVSSq5Cgz+vyVwNczpaxTojD9nLjCJQDdrTSkwaxY4PtvcPfxgjveBZD6/ktLJKFLtDhNDtLxMCRsS0c71yVxk/B8qwuyY4xsh86QlTS5KbrozZX+iuhssQpev2XdH2hfps6inQbbrpbii+fj38dc+0oa4nvAhqFOi8xu46uelzdgQuxysnb8nDL1g6Nxl9NNvlSeszVx SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1443; 20:XYsQRjvhwWIwTp3pB9cX8VHAT8NnfFmsbVPtme5XtkeRMovnwPxh8ANE0vjguyQTn3fDZRPChhBy8jvbJQit98ABOJrCDtbly0s0qPN15JGIqwvf1oYmt91+8Uw347Y6SVPyuFHm/Wa3Q5zFpy4SAIHtlpbF8fOSb5XR4LZ7hDA= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Aug 2016 02:20:43.0762 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: HK2PR0601MB1443 Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: <linux-renesas-soc.vger.kernel.org> X-Mailing-List: linux-renesas-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP |
diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c index 8b1efdd..64896e3 100644 --- a/sound/soc/generic/simple-card.c +++ b/sound/soc/generic/simple-card.c @@ -309,17 +309,7 @@ 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; + asoc_simple_card_canonicalize_cpu(dai_link, single_cpu); dai_link_of_err: of_node_put(cpu);