From patchwork Fri May 20 10:05:55 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9129133 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 1256360467 for ; Fri, 20 May 2016 10:06:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0466A1FFC9 for ; Fri, 20 May 2016 10:06:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id ECF7B27BF1; Fri, 20 May 2016 10:06:30 +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 788C91FFC9 for ; Fri, 20 May 2016 10:06:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753337AbcETKGa (ORCPT ); Fri, 20 May 2016 06:06:30 -0400 Received: from relmlor3.renesas.com ([210.160.252.173]:26751 "EHLO relmlie2.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751971AbcETKG3 (ORCPT ); Fri, 20 May 2016 06:06:29 -0400 Received: from unknown (HELO relmlir4.idc.renesas.com) ([10.200.68.154]) by relmlie2.idc.renesas.com with ESMTP; 20 May 2016 19:06:26 +0900 Received: from relmlac1.idc.renesas.com (relmlac1.idc.renesas.com [10.200.69.21]) by relmlir4.idc.renesas.com (Postfix) with ESMTP id B512348430; Fri, 20 May 2016 19:06:26 +0900 (JST) Received: by relmlac1.idc.renesas.com (Postfix, from userid 0) id A9428800C0; Fri, 20 May 2016 19:06:08 +0900 (JST) Received: from relmlac1.idc.renesas.com (localhost [127.0.0.1]) by relmlac1.idc.renesas.com (Postfix) with ESMTP id 5E142802AB; Fri, 20 May 2016 19:06:08 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac1.idc.renesas.com with ESMTP id VAG17884; Fri, 20 May 2016 19:06:08 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'";a="211716786" Received: from mail-pu1apc01lp0019.outbound.protection.outlook.com (HELO APC01-PU1-obe.outbound.protection.outlook.com) ([65.55.88.19]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA; 20 May 2016 19:05:58 +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=zp1Y6egfgCGIcKTKT6DOkzbuDvjmiG0Y3x9D4KaQArQ=; b=Gk9IQyKX9VELhPQdO0W6VylkhrMnNPDPtbwV5OMsMDF80bDinjlNO3iVZepKiE+9VrhZ60exHSm5RkJQ6NJWXc3ACqWDMSgOC/ojJ2B/r5puGI8QssgySY62rpHnSdI6ms7F47V+Qpo4lG/nMhn1jGZyBvtWKgmCa4I3d4p+ETs= 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 KL1PR06MB1701.apcprd06.prod.outlook.com (10.167.63.15) with Microsoft SMTP Server (TLS) id 15.1.497.12; Fri, 20 May 2016 10:05:55 +0000 Message-ID: <87r3cxoxrl.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 45/49] ASoC: rsrc-card: use asoc_simple_card_canonicalize_dailink() 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 10:05:55 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: OS1PR01CA0022.jpnprd01.prod.outlook.com (10.161.225.160) To KL1PR06MB1701.apcprd06.prod.outlook.com (10.167.63.15) X-MS-Office365-Filtering-Correlation-Id: 8a5c4115-f342-4193-377a-08d3809655c0 X-Microsoft-Exchange-Diagnostics: 1; KL1PR06MB1701; 2:jC1kF5WttXplbdIqlcGpvs4kUxJVF9VPY04hZTk0VMg1B20rFhtXqrrbLWRErpo499ePMu99pzrBGMOmlLO/rjF08rjhYyzHIaDAjrr4C5ExtOcIzY1SJDaw0NTTY0LkW9IUW2nzd/SMgYNjhSs2Go5geO3SgPipL8smPvOWi7gYDRhIyRbHZgnaYOUAFePo; 3:VWEora0Qv+E4f63QX3lsZLDLG2/4E5DQZHNctgchZzTJPcpmK37Zrg6fVJuWnk4+jXk9RkHOwwKJHENJy9sWb7RS/JifLF/oFHsnTftZ0A5EQRSjp7MvmB4W1/NTS1cS X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:KL1PR06MB1701; X-Microsoft-Exchange-Diagnostics: 1; KL1PR06MB1701; 25:aR8Hhyu3w2+taR8XJBUtj68kcm7ABNyzwRCZdf9TFrNNHaLnP6WG4O6J+KGx7/nIUh0oQCfPu61dmpxx+SH71DuYizW48vX9UdKtH8TjqGXfdFnblbUtGFMskevhvKggTdktSsdMB4RmRmSK9oZAJdwVfMfHXKwVXLNbzjM3XVbw1SQjD0WmYTEw1yrDhqlirfi72LXulWXjwAhUR7l+H0dRQYuKDd+RdX+k4Id2UrZESSuD9g1qYQF7NsG2MbloWQMZc5VNYW6RYLq8Qk00Ojn5DmXWa8yawZIqcqHH7O4JE21l5HitNg43PvQn+JROh1lHu62mFF0NRVLbCH0T/Pfnr+mjtVE7CwsRUNbAk6tGcf2/QifxnaT5scFyqh5Q+ybLscetgqMvBzii1anHKrZY2wGONz1bzVyAcsFTEZyD9wNleVOd2Abk89Tr5gp6wWmvnp+Sv3cCAc7Yyu7m6thM+aWSqd6W39F498+1IsgZ8YGqfQVWgFVWTT9mfoiJVFmNtxGuRtHwVyVALb7s467ujaA0DK92ea0ri1CMkmDJPXWdYJrc7IHQGQGS9fQLNmAKlm/a+rBbCDSvdYKV4oYPM+KZMZqPnPA0UrozDl7XyX2YAMsW23aSheMurc1KeJNViismCaesuV4/YAmMphpACgdZqKNAcgePbmaGf7+vPYQf+VXFBUHQcIbkr38HlgUrWjjUbFA9mUvk944JiA== X-Microsoft-Exchange-Diagnostics: 1; KL1PR06MB1701; 20:kENa366kWPqTbozGOb1XuSqNdk+Ttfe2n7/eRiQi3P9xmNYu6Ln2XF/cY7OSL6nInIcbq8t70YbgjQm6iPk3iOzFQkkO3oTAGiJk2IKTHLp91aV0FAt69yebVhdQHNDoBN59xS7AQrSPdXleIpgIPBKMiMFQJB4W9IG6v166/o4LucTMMc1tcr1fli5YZZfoUjo7jDbSqnQyF/g2OfwKKN27FGT2z5uXuhYI9kEaTlQdB76MiXWmlbejzZz960KLISmx5GameRYNTqC/5IFTxI50vFyE2XTOSH7z89ExhQUV9vMBQQ6PyvK6rA2gX89KN8Mq/PHOsWJg4PsHJAtjRWTqaDZ1AgAu8UFVgGha8mYFAlHNAhJ7n/JO+Y5GmxtD6eWYvo7q8PQwd813YS0xJhPwR6VsRfHHitXJ85QFV9nrzWTMR8wOOFPEVHvdkiYfY2830rfhp0tfyqdl7HaxrGPDROZNxU3fEoQJAQtKo6GDhkapN/o+z/gTQYlEC6co; 4:zsNBizaQPxZqmY5zK06uCCPHDgx+blXDHgbKwD0b5qCwj0WlzurCfXgfOUMMTb7Nm95WKiOfTfYyjLx7F19fwVt3oAv7FO7FkqC8Dittt1BSGb4Bcj8CiF3j4gEjVBRUjoYtx9kl5yWyssRnFMi3d4q2P4RokqsZVeJZjMB8IJYfTQRGVeetpW4ZH3i96012fZgWvaDC4eF9DmQP2Ks3d2W7SxWkJcEAGxbW4anbYVMqQOBczYIt30GvVLOAoM9pJxh9M71YZJH81/UuiFB5l3Xw0+QgHiVYUDuDbx0aJgrWonAIQXvU0c0Ayr1IhBC6xArIRIaGBI1B9cC/i5/Y23xOuBzHsUBtzU+ubpB0K2bP9mGZFNO1fyYDrN5qGOAm5rE6PhwVB+bM2DdyUUdNxQ== 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)(10201501046)(3002001)(6055026); SRVR:KL1PR06MB1701; BCL:0; PCL:0; RULEID:; SRVR:KL1PR06MB1701; X-Forefront-PRVS: 09480768F8 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6009001)(229853001)(83506001)(77096005)(2950100001)(47776003)(66066001)(76176999)(50466002)(5004730100002)(53416004)(54356999)(36756003)(92566002)(46406003)(42186005)(8676002)(50986999)(3846002)(6116002)(586003)(19580395003)(19580405001)(23726003)(81166006)(2906002)(33646002)(189998001)(86362001)(110136002)(4326007)(5008740100001)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:KL1PR06MB1701; H:morimoto-PC.renesas.com; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; KL1PR06MB1701; 23:R8GFj2WDLBm3pwb/s0LHFavYsZLNYS+sh1Zq297g5o3wUh7r5VpU6gb23LKM0v8zkQonqw6b6qCfi+TelXobThLaT/Sf6V4VUAxpBaZaryuLme1ndAHwkQEqSbQGbCQ+zEBcKLTK4ftRvkeHD3k27CtJ6E+zv9R6j0YbZvzd1xi+r9DRMEBg3x/zs/MHEc31ebC6JjIdW58vdrYo8R36u01zQWkRT0/AUBZgbqeu6L292nJrXKk9VR1sQmG1cgEUQDQdlYGPKXpJGlGtaqVZp7RCEbmp89bEibpvsdS7Ezyz8K/wuz3/JQgnxCq+0QYhvnKpovzWTgagnWYrE9WP9dqasWIwEiQPs3qCKHPUX7vDHem9FpkTdHMds+ajSokdhAYpJugPK4e8Ur8+OvGs5qrFnqeZQ1Gj8cB5AQf5d9B7qJVsC20WPnEe+Xsq5lrCbZRttuCcvUlOVLJX9qga6IsBQVdItjTk/aGy+a2ADT16siiIyRlWrb4apJkZsox9wQHn0cjjUUo0GYqwTn+6Sep0Z/MkPpfkcATqAtUE7eTXVclILjoUQeYB71WhfzlOk+DLXXthhzjTvoZf0PguVHDQbIWR5D2kjEHfHBQuWAKefHZU30cT3dVqDl21f/3uu/O6Peo7mKK3mn/PIgpla5GxmKtHWzkocedFd0TEFG+fq76LeXWBB+LWrBy5mhhiOPlg2S10TdgsJLGQzH6IObnIShr4fl+ERRU4o9SCG7Pm9x2sn+C9LlE3PuCLCbD6drVgdkH61O3FCfvH5jBG/toEqGKRqXZOoKkV58RziZD7p+pxMUW8lMVQABUHOCDDYuZQFgxRH5d+eBbNvY76W/DYWFG1NCpHg2P+pQsmcLWRshute/exyPDvNDlE2A1nb+ik3ACJ+MD4Lh5lV1rUmA== X-Microsoft-Exchange-Diagnostics: 1; KL1PR06MB1701; 5:TiGRpNlpCSatfqGRGiwgKWdaqEKfKfu3U2ECIcibUgD4ACxlHgDb6/9SMuzZPCj9Ww/GXwkYgkKuvl7J/wKZ6MtdMs7EPJ9ShWF2R0aLUeObUHb/VF7d1iw9TS5SBJA0n+7d0kPClaSxgcbIhpGKxg==; 24:NMzCXH1BpYqYhT4e2TEG4HOjhaA7uigF2weAqQbWzQ+TZyh5nGz+7EPBQGQLQUKtRo5w9GIr25izaIPeyGKAeg/QWMuv98ULXCuz/IH1Mh4=; 7:bM+HxE2oj6WWaLp/0/DVNRX8nhxHDEPLiMInU4sLVgA5mN3Kj3FbTZJDgMna4fDiRqjXLlS9jT5f8iw+NHRTLSrjTTMeNHDge5bY/n4RLoZAy3RvsbchX9h4KuOembNFLmg2iZ2JRJvWWKuLSMzzjf3c/ZC1AgKhUVbEARkihLw3SE6MAFdAAJJm9S5QxyKy; 20:52Th3+IdQfPTlZnVm8j52q3bR9J48dKmXcF+SkJPXwf49QVMs9BcoXl7E7RaUQ3lPhoToCosOQRPPHjc17NKGf1y7+9cIry3JI1eg3gS4Pffg4Tp8AtfqKGsB6dhaLKqmLubDST6fihP063NTXwC+apbuGHkdVwm2xRhs48Chs8= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 May 2016 10:05:55.0700 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: KL1PR06MB1701 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 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sound/soc/sh/rcar/rsrc-card.c b/sound/soc/sh/rcar/rsrc-card.c index b18f156..814cdbe 100644 --- a/sound/soc/sh/rcar/rsrc-card.c +++ b/sound/soc/sh/rcar/rsrc-card.c @@ -182,8 +182,10 @@ static int rsrc_card_parse_links(struct device_node *np, if (ret < 0) return ret; - /* Simple Card assumes platform == cpu */ - dai_link->platform_of_node = dai_link->cpu_of_node; + ret = asoc_simple_card_canonicalize_dailink(dai_link); + if (ret < 0) + return ret; + dai_link->ops = &rsrc_card_ops; dai_link->init = rsrc_card_dai_init;