From patchwork Fri May 20 09:58:17 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9129095 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 E20B86048B for ; Fri, 20 May 2016 09:58:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D49EB2793B for ; Fri, 20 May 2016 09:58:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C98A327A84; Fri, 20 May 2016 09:58:25 +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 49C402793B for ; Fri, 20 May 2016 09:58:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933311AbcETJ6X (ORCPT ); Fri, 20 May 2016 05:58:23 -0400 Received: from relmlor3.renesas.com ([210.160.252.173]:47095 "EHLO relmlie2.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S933222AbcETJ6V (ORCPT ); Fri, 20 May 2016 05:58:21 -0400 Received: from unknown (HELO relmlir1.idc.renesas.com) ([10.200.68.151]) by relmlie2.idc.renesas.com with ESMTP; 20 May 2016 18:58:19 +0900 Received: from relmlac3.idc.renesas.com (relmlac3.idc.renesas.com [10.200.69.23]) by relmlir1.idc.renesas.com (Postfix) with ESMTP id B0B8652FDC; Fri, 20 May 2016 18:58:19 +0900 (JST) Received: by relmlac3.idc.renesas.com (Postfix, from userid 0) id 841FA1806F; Fri, 20 May 2016 18:58:19 +0900 (JST) Received: from relmlac3.idc.renesas.com (localhost [127.0.0.1]) by relmlac3.idc.renesas.com (Postfix) with ESMTP id 7C46D1800A; Fri, 20 May 2016 18:58:19 +0900 (JST) Received: from relmlii1.idc.renesas.com [10.200.68.65] by relmlac3.idc.renesas.com with ESMTP id UAL05793; Fri, 20 May 2016 18:58:19 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'";a="211273401" Received: from mail-sg2apc01lp0241.outbound.protection.outlook.com (HELO APC01-SG2-obe.outbound.protection.outlook.com) ([65.55.88.241]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA; 20 May 2016 18:58:18 +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=HcIZ+EQ9mKcLr/ILWok6K2HxueBdZ+W8ZGGuyixSfeQ=; b=jOaAvxh5u2cxDccSdYHopnBY93Ivx8QyjQ88V41cNgosVSoeZy/oCM1Lzg3oHeTJMsBe8uVjJLPbHHJrTYax5ea/JA/bTKyh97v1qkHtuNSrgaoO5jrqEn55GdNBxMtcPLJooKIaxu3puKv8sqeBw2V8fiG9a09xIVFZQOQn+ak= 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 SG2PR06MB1709.apcprd06.prod.outlook.com (10.167.82.139) with Microsoft SMTP Server (TLS) id 15.1.497.12; Fri, 20 May 2016 09:58:17 +0000 Message-ID: <87bn41qcor.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 31/49] 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: <87lh35rs8w.wl%kuninori.morimoto.gx@renesas.com> References: <87lh35rs8w.wl%kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Fri, 20 May 2016 09:58:17 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: OSXPR01CA0053.jpnprd01.prod.outlook.com (10.167.144.33) To SG2PR06MB1709.apcprd06.prod.outlook.com (10.167.82.139) X-MS-Office365-Filtering-Correlation-Id: c57db2b0-54ed-4092-7b4a-08d3809544b1 X-Microsoft-Exchange-Diagnostics: 1; SG2PR06MB1709; 2:jolQFsQA1XpLi8MTumyJtOK6U2YFWH+k1dxYDhpjkO9nPp+QBue3fRRkSLvNHliffPP7L8A9vnz7kpMoMzXVjolcqWBwzHc5+naYyl1LQzCgIHEGm9zp1+60A4AZ4SQ802Og1WxMSJykvXxT3sDVwavSzrCEUr2fJ8AkUkNSAC7v53RTRd8qct3IHwp5OObA; 3:yEUHFH0MxnGH7N+QNnYI65qe1KQllTjp4uZSQ9VOgpXeWzszfrFHOoaun0ypu+QiNU/6w6pNOPseQOKfeAFbpN2yhghYmiy18Cyc1PRISXMca2KFpzt5jnBRp6pVMECg X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SG2PR06MB1709; X-Microsoft-Exchange-Diagnostics: 1; SG2PR06MB1709; 25:P/bfH9PPwirNzCcymkB8g5hCrDgNDgF54wwL/ZiXY+uHFvnR5bkh/4vHLJt2t85Io4GgChxDWiyksMoexcdZpzrbWxwTv2bEQdKlGSlDuXTuFHYyx3yJWhMEVdEp+Sd2lUb5aPGjcu6Y4DByo/VbEbe0NFC7WdBqtgSAxAtcr42mwki3q960+hhuP4dcMpli3AiEi8/ekQNIff3UoQ+U13aXqFcBoMRqCx9diPfSCJZTpJq4DfhKtPgeVm06x8Lw8yVQlVEtPrLdVsJcfJRGowH2IIphnaUgxLReZheBpQRlK1TsmwypHn3AZNpQzKzjPtZf8kxFjG1NkIU42ga7/sCNRhEoWjZQFvAgpIvWEYSmsuccvKi0tpEKFMpdmTD/7RX1PtQw9RMMGAec5WOpFIpvHkwTIm/x/5xkoXYO0C9WJSFSp8PAsLiozB0O8eApU2rJWEzXM5mmZ0xp+fFjbAl6JMfZTdAzKXWWXPN/341RijUPOaK/TqAEn2CZ2z/uwy1iRILdQ2GBT40XbhGEQcLwVxU23PjY9pLRhMbQJPJWLEdHSnDjwQIyJM4juWNiH8WsIJXNfteywJJospbN4Yjy59VnRHc3pugQR64f2c5UrVwvnIlKcaeLVvxhnjHxFNuP5WZyzCdZT8kTI593zl7RuuKI4aN+uxPBsuWpOAs30K6dn8x8r2X9cY6Oc+C3w1EuydgxevtgDuKdV6RkoA== X-Microsoft-Exchange-Diagnostics: 1; SG2PR06MB1709; 20:4NsA/iYem0TnnbbwpfkS3zRK5U7ORCFLqSsW7/AkVLLjvmGSP7t0pW4CLehGesRBgRxrBkYuoHkXKnlfGjxzlNeCufwms7HzChIVz5d8Ze8XDdIcLT9HWeRKtltqnhHdLItasQWUBO0/Yzo6VHOtJcK53mDIl7J81u+jfKO+VWzgaGxH37SOlCxG0uqbv0IfnagGr7lh20vqSuN2/cxtmteIAPEopBc/yY9xfizhRZz8mZyW3oz2vbuGTAxB8uhyQ3t9thtklgDCmO/+SXTeEFwoBdnTcRDZ6oH+u70zo1KuyKdF6Xo5q77AmM1WVPQ+CAlR1HVHn4oMhtZDxQbwTuLIJfw+vhEKn6tA44ib6IXPM5re98jvoayyLEnmUo0aaIxb7HcMbZlnNArAHgRgHo0GRBGTu/JPCQ0hMMEr+GaHfX+IRHKZ1S4WNeliQqBsaW676w5KPWBKk53/tJsOv52cxBED9P8EtUAmrNx8F+0vMCc0Ap75yE7V2ovl8b+v; 4:+aU7RY2/ZIp0SmfAceuB1wBWzdLEFbzcbiIK5FpdW1I/7q2DLfs1TMzOPLckvCIBKcDQ6UsfR9xO3snulI0S88y/HxjD7e7/Wyn9cUPVvV6Hq9eszJmF/7NA3+lb8wJ/wrJtkIzjF6VPcqc1/NiT0ovcbdBXzIW+cPem6QmPpmI6Qhr781bM+PjgGsT1LsJZG50Y9+l+V97YeHRlzwWVaAcxSZgBZk7fhW72aJc59vzJPYs+lNuWjGl2T2JUMCn4nRjCnhzZ2oQtp6jY+8Q4V32Ggk7A5MBrAEVqqWqosJGrsJ2SzGwVBVchQR4ah87oOutAHXuoFCFfUHXYVqdGqcL9ZP4C4jHJHtlaGu2RzIZlbm32iew9iFGtpXJZk5dklPvqqc0c7+L9D9JpS1ReBA== 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:SG2PR06MB1709; BCL:0; PCL:0; RULEID:; SRVR:SG2PR06MB1709; X-Forefront-PRVS: 09480768F8 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6009001)(2906002)(229853001)(33646002)(4326007)(53416004)(8676002)(77096005)(76176999)(54356999)(81166006)(42186005)(2950100001)(86362001)(5004730100002)(47776003)(5008740100001)(36756003)(92566002)(83506001)(50466002)(66066001)(3846002)(23726003)(6116002)(189998001)(19580395003)(110136002)(50986999)(586003)(46406003)(19580405001)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:SG2PR06MB1709; H:morimoto-PC.renesas.com; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; SG2PR06MB1709; 23:RB4UGVi/koHgyDf3xEVfBK6rMxdEhRDeoerTxcSWUhXO3uxFU/zJRH+mLxCvkMT9zVSEsq5+nmg3HwShp2OK9qQuVpsI7wyF1eclTqyBjdCirwsA+y1fCIngNIMwju+6odQLXVjlUUgq6Ym7KTXWGNWwhxpZg+FpnGaBQp3ui9y6nQ4MLYtjfhXDTOBRLDFAKaE+cb0yRwyFDh4JvHKcdhM1FEmIVdqLHNqEqLBG3jSbTn4HD8z2lPB8gzweY6YMhrfti2ilgp9yMOskT8MX1mq15DJN7F7R1PiCy0SuQLaVM+wtLKsf+xXtQANn6zOtNWpSYYVQgL8y4lVXAF1UvoY6XE7YRFB1cNO4CdPhTO4EbCA4vAXCcYfy74J/rmYCxz0Mn73Xgh0NtmlnucBGWeWjTLrcL1LBB7h9T/2lHqF/XTNIZaRAfywZs48Mk4oJoVbWzrfr32v1LIeR1JQ3k8he7jBfamsHSOKyoinsc/YKwXPDSwaAafzIZOep1LdodL7k1E7SI7RVS6ZhfkO1x7LvgfKwWwbHnE54P+1Okdx2GWCc9WPsYdXBRCk83A40dZOBrTVdlQZ7glLBRLUTDSC17YsK7mZ7w18QB3rdedybGkdagZNnGxvsnzoxlCFvhdO5doHcaRy2sXvpQASp3Y3eTPENIpZh6KF9JESX3DAimzNcKqJ+e3H9nHIjVQZUvAvVCVNewENrQrBjSWiUYOJkDbu7eUMe6vRmFDMADYVnlM5zAUeFNw4UZSTg7AVV5QsToqc5GJNqJfWJfkaknBeCYEe+aXitFM8Xk6zP0q9dGzVQTk46iVoAXxViTKmCYgle5VECAlvTxNbZ0dAioJnIPCz1nzpjAKuabRtiFSSAnux1/OhNqmpWQWMpHAT6N5wcQFm95/a2V3b5+otGSw== X-Microsoft-Exchange-Diagnostics: 1; SG2PR06MB1709; 5:r8m1SYmYgJ37gzCrq9W/VSILNpU/7qbVkY8dpijQpEJKnZLYF+v7kzdMPnlHnq4Liv9ivOK6dxCjv7OgUH69An2p7c4VTeqPa0MopiUYAGv8dh1HOmQwwthnGDmu/esj9/AXg+vQvX8bgKYlGOE16A==; 24:nEMb+8IdZKUBsuXp9xnvIvhqWRoiBDELJ6DiiHU8+LIB0mtevGY3P6RdKFf9Po8TPaVufZwi3L1KzSQT4dhyOlrks2RZrPQdQ5yRB/Sn0iM=; 7:0HQGEkazOU73jtUG0lWcPVPyZnoP0Mbywtp8FtpBfNWupHOUp29+uIR/g9WaXlfC3qIqm+kj0LpYkliN/6L4nwrleGLKN7GLdf6G038xo/BUC4DkU/L0TXP3on8l9YRdW1kxk+fPLktnxXpQIWVDm42v8OyLj3pDwDPXPxyjrMpJ0VAmMg+9OBckRFHWdJNj; 20:IGaof+ckZoim1eQdNgIfcEWt9SJkxRYB/m25s8MVMU9UKxJ+ljoZMgVPoz2jD4bhDH8+NBRjMTKdqDm3WWl+kK9BcCH84AZFKAW9qr3smudheddPsIimX27M62E0RThuX2IK32c1MpxyKa1mAp+CMGBsqLvfQI6Zz+NL+/OLqx8= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 May 2016 09:58:17.3929 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: SG2PR06MB1709 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 ec07975..2ec59ae 100644 --- a/sound/soc/generic/simple-card.c +++ b/sound/soc/generic/simple-card.c @@ -231,17 +231,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);