From patchwork Tue May 31 09:11:51 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9143945 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 9850060777 for ; Tue, 31 May 2016 09:11:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8417628185 for ; Tue, 31 May 2016 09:11:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 788E327BF1; Tue, 31 May 2016 09:11:57 +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 E1AC027BF1 for ; Tue, 31 May 2016 09:11:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756903AbcEaJL4 (ORCPT ); Tue, 31 May 2016 05:11:56 -0400 Received: from relmlor4.renesas.com ([210.160.252.174]:26333 "EHLO relmlie3.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1756637AbcEaJLz (ORCPT ); Tue, 31 May 2016 05:11:55 -0400 Received: from unknown (HELO relmlir4.idc.renesas.com) ([10.200.68.154]) by relmlie3.idc.renesas.com with ESMTP; 31 May 2016 18:11:53 +0900 Received: from relmlac3.idc.renesas.com (relmlac3.idc.renesas.com [10.200.69.23]) by relmlir4.idc.renesas.com (Postfix) with ESMTP id 82C5E498A1; Tue, 31 May 2016 18:11:53 +0900 (JST) Received: by relmlac3.idc.renesas.com (Postfix, from userid 0) id 82D5D1806F; Tue, 31 May 2016 18:11:53 +0900 (JST) Received: from relmlac3.idc.renesas.com (localhost [127.0.0.1]) by relmlac3.idc.renesas.com (Postfix) with ESMTP id 7C31E1800A; Tue, 31 May 2016 18:11:53 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac3.idc.renesas.com with ESMTP id UAF13117; Tue, 31 May 2016 18:11:53 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'";a="212432539" Received: from mail-pu1apc01lp0022.outbound.protection.outlook.com (HELO APC01-PU1-obe.outbound.protection.outlook.com) ([65.55.88.22]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA; 31 May 2016 18:11:52 +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=W4hHq5N6vxvxc4hP2AWhHqMEyQ47Coiwxg/D52ljgLU=; b=WG4Z3uoLq9YJwEzD+alowz8IxvRnjwVOREiCHHpq3f2qR3Tho6k6N/R3BOHjNTg9W0RDbGTDXBZgWHFzAcpCUob0cKK60sDykahfwmUsg4ozmUuvlQCep/AIfIk/ri7S/txyjU1wauKl3hCfzGqfXKJvIBpDTCNMLH1sYHV+tDQ= 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 HK2PR06MB1700.apcprd06.prod.outlook.com (10.167.73.14) with Microsoft SMTP Server (TLS) id 15.1.506.9; Tue, 31 May 2016 09:11:51 +0000 Message-ID: <8760tur414.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 32/39 v2] ASoC: rsrc-card: use asoc_simple_card_parse_tdm() 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:11:51 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: TY1PR01CA0125.jpnprd01.prod.outlook.com (10.167.154.43) To HK2PR06MB1700.apcprd06.prod.outlook.com (10.167.73.14) X-MS-Office365-Filtering-Correlation-Id: 4cc25703-2e4a-4315-bace-08d389339a7d X-Microsoft-Exchange-Diagnostics: 1; HK2PR06MB1700; 2:1w5yoWeqA3xc+aXXHwbmZZ9K87kuKMkW8mR/4Grwtk4fncrFpha0IeTTS+Uj5LwjLErd56Za1u+FXaJR0F2QcLuWKATHyfLJ4GUzI77AufqS2dmnD4DHKMLq929rFsodpb77ss1ozxq2zavfAI/eXRsh6enQl+v9OIxQd9foLYw7SikGWnQzazQWo8Lm1RFe; 3:T8KyynCSBVPmO3pN2mYyaCjlg5g4sIG3xgC3gCgS0OkD6YT4fLIHi/rP1dFSz9CTGmhnk4BBCgiskEXDkEZhvxpf0TB+6hSQrYXEnrlpgM1mYegVpjBUZyohzXJbjUF4 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:HK2PR06MB1700; X-Microsoft-Exchange-Diagnostics: 1; HK2PR06MB1700; 25:IszKyrrYLfhbOJpA+zzZti22L92OVOcaFMysibkXxnca5M0ExtfgQ1C2hCPjTWlEwRtaR3FB9ai+Pedz1NnYARqDR1OaeH7YmWuMs4fzAW15YakCZ75Ba+jZ4YCwXEYzDqAlQtxHv/Q4LUpEn4qkPUgUA2/t4z7U21M0URkHRhjBMe78zEY0lK0IaOPavRJJgztK2yxI4BC7JTTqJkOSZRDPHFVewOkv+FBFw7R7w2RDRmbvdJ97WyLj+ixEXe4XfEUTKUTH61o0oIhIvuO50zlqlw++xNBIKWMB1Te1aIoyEeSrnUqJCCp1JA61jdJ/rR968mHWhuG7oB7EsedfYCBawWibLhN9SZHiTsCnMmEbBMzlL8eEMwbAh2nFwpiDv6rPkX0JZxmlDoYWfz+ibqN+fkdjLAnth4oQkA6UORlmrPBu1QIzuv+kg7KXaV4/QDxH0EieP+pLTAePr9AfamD6RR+efWCAHyjUVL0t31PbAsY25Rvh4JxIrKPP/o5vDxKnGfURDwzMR2dQMCcnthti5aPg3l2xdrvGEe0Wz8Yu+3JCQFO9EeYdi+ndcxIiUiefve8szDApPm1c3vCl45PtBr7nXfwTySpQZ2gLfDSvkozdVLbCt5HQCaiE8gwpI6UWprJUtCgTuws1mB8QAdVyIW+i3jrSpnR07v76UiXLIroP0TvDhVcovLSSEErNCHRhkn2y8U46MpRlUjPSVA== X-Microsoft-Exchange-Diagnostics: 1; HK2PR06MB1700; 20:AW1eYoWGneaUbEG8mn/I3yOPObVbhP66xdzxVRMdVkPTr8RLvF2ED9MQIisBBkf1Wdp7YSz2fGZKHWDCqvuEHkXegK0cdy4cNgoNgVu92qA03Ts+i12TpQocgubL/EXMfHKaAU4MgF6NSqlL49t+/702i4XfyU9qxbPjdOgJyWa4URfT2D06qQRe100VBbUkcIIBZ4s7TYvRq5Vdlo+DEO68vyLKHnq1SO4MdDda1E7IAG4K5zFBU5tgA0slU4CyrwEAof7XK4yFhFwwDtHeoXDeX+6Ks2QNROho/gfZJK0gvdonoMmBiM06RjC7S0/3F3dYJHfs/5L7IqP4vCVunMtkTimtX8UYnJqZNK3hMeAh+v3maufvZGvlNPUAp/dZrkSxbSqAsZVMdmJqxuShAAbpa0Pnc57Gt7Ty9TLgMU7g1Yn+/YlufV2eHzyQm/JXIxtj/mT3MRwI0ueeRZzxVaVCpiHhE//JMlql63GC1aos1c299iQ3zPhcXtVixH8B; 4:+tjAPCVMt34AchBP8KbMPw7jEHqGYPIk8ItqfcWZroLN4gffETI5Az36SSd9FmLXUS5tD59Pp4zCGKRMYOj1k/8EmR9lCvo74PbLCl8ksysMTAK2bAwCifgMKkmzl7DYsL5dwqenxVRYS8HDxTAc+ndrjjlcRwetyk+IvHRZF3Z/QY99qRu7p/mr2WbyNQshYXBabg6MxwZuVXBjEwj9UltIUkUFHZbNVWUI3b0tRArk+Gr5J37mlVzV5JNr81DUEWwNTjcyRNfS9k4xU5495M3sq8SuBOE1TzgP+CYpEAcEeW07tmGNeO+UEJW0eP1KEUxZ9Qaev/mdIgla8HzUN/9ERDdaOZbCPCr//uEdqzLsqs4iAdHRx/EYB6jcsZVds2zgU7vl1e+TAAbrfAKZ1g== 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:HK2PR06MB1700; BCL:0; PCL:0; RULEID:; SRVR:HK2PR06MB1700; X-Forefront-PRVS: 095972DF2F X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(5004730100002)(83506001)(86362001)(50466002)(2906002)(66066001)(54356999)(81166006)(36756003)(47776003)(42186005)(33646002)(76176999)(50986999)(53416004)(46406003)(4326007)(586003)(77096005)(6116002)(110136002)(3846002)(23726003)(189998001)(5008740100001)(2950100001)(229853001)(92566002)(4001350100001)(19580405001)(8676002)(19580395003)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:HK2PR06MB1700; H:morimoto-PC.renesas.com; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; HK2PR06MB1700; 23:mM9GfISuWHILAWTtbB4oV5Ldu+poP6vicvcmUQkY6?= =?us-ascii?Q?EEhol8LUscx649pQmW4xCAfeFo2w7CSx5nluMoGoMnfHT2PBNOXcLm57xYxW?= =?us-ascii?Q?P5c+FwS29Cjb2BVUc1JA/1Rimb3XVw0rSDiNQZImYUF1r+CLoYzMPh2Xi/sK?= =?us-ascii?Q?1jLLoHXeijfj1noeHgLk+dDyxTukcP5d+/7sBqgvv0wIvmf4FQ9cEQX+14/W?= =?us-ascii?Q?i5SQTwNjR4b3sfacKV211Kta+0exnWmhuyadNDVmj9DnM/YYDpUjk4URvGI0?= =?us-ascii?Q?6ufd/AFI5McLhan54PT9L88LQtB8IEASUNz+53C/h1HqLIpwMmBqeU8/2xl6?= =?us-ascii?Q?XmK+BAJ7HdWe9Y5YAIRuDDIc51jKqOe7r0Kfel39fLlurgHcqGLb8oDI0nFN?= =?us-ascii?Q?MAmf5zBMgmjYR5jBgN0l7rJuCjd381HpOkzk1BPvGT5gKJtNkdlCFlJKB892?= =?us-ascii?Q?+QdB68zjyoyPIuJMzCnh08KH3tKr/v/9K9zfoZVG4fcGDrYx9hBxvnTcYSoU?= =?us-ascii?Q?htORNWf6RflM4yGsgjWy/K5a7U/dXoZqCp1fbZ89yas1iHDoOw9WYMzFiN4B?= =?us-ascii?Q?s+xkzXshmAy/OgRSG3N0rDY9LUUDGHnGv6uO19D8QYfgElX2Kxrs47fODRzK?= =?us-ascii?Q?rm4aRSQtq3xOAWb2XJNGVmshM5xHCLMpv45eXpZJZbIYeZDEgfMCLkH+rLxA?= =?us-ascii?Q?S0bCflBERaoiUZqmPuXHDxg2of5FaaW7gR7Ymawe1rA4gthhunFEnx2PXv+7?= =?us-ascii?Q?udEIKZyNH6dQJ2GGeh/6ZuLJNSnTOG0S3kCksVTrrOIhbT9oaiX0023uqLFz?= =?us-ascii?Q?dKokN7O96C6kIX3+KBPSnhDKOltolKIwiUBwp0/2Yea/0vtYWQGws67JKZVJ?= =?us-ascii?Q?GZPB9Kd7tN9rl/3reMBnVsyx2KjAqu1pFd8QvNLMfD47cID/TuQYiPjdW4Vp?= =?us-ascii?Q?vp1sf4K/cdNX3xGaLEeqEbibaZQByJk2KPSB/asZA=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; HK2PR06MB1700; 5:lciWCsJA3CTy0fx6IxJ4iCNZdxNk28Pl15krCWC9eqQGyt7iR6UmDWMLoRjhpIopSQErucTpcsxN82deebXsjAOdAjfAMk+NFfCfzhSBLgu4S9LIErfz0nPi5bWGv13PREYPbGo5o5RYqw2A9bEhuw==; 24:HmHaYUEcH95iU0G54LlV9B+K96PQbiKVafWm2xIHMdK7fVE/4EbkyoVIxHOISeSOTH0jUlA/ysiR5lRZtqRCnI4pdQOJAJkiQCXczmCQSGA=; 7:9FcjG2dviEerbZZDOKDq1pLAzQTuAYCfKJKJhJW2NOMKF1v08pdmuNBIrE7sDTWdP8cetGokrRwku1ZNBFcegAYUgrXE3qze9sVJxYLsuZE1muA6MCHlNrnqzwiaS+QRcDdASIORZ3G+BNbHLEo8zu8K0ltO5Y/6x9/laGga8jtVuyaGidoKxmttnwmotwVj; 20:X0SJ3SKw0C/TSAdvf7B9eVI0QE8cvXRY0kVxWEvlHpCnaJh6/ftqgLg5D54f52RnO7ANdzyrDQQJi+epN5rKFu7shhEbGxYaVJJGDX9kwWGeDDFp5LIWh+qsyGn5gUsHNxj0X5kP9JzW5JEOTKagqDdbFR4nCQz0q8QQqOjQ5/c= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 May 2016 09:11:51.3109 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: HK2PR06MB1700 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 | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/sound/soc/sh/rcar/rsrc-card.c b/sound/soc/sh/rcar/rsrc-card.c index 16279d3..da3f219 100644 --- a/sound/soc/sh/rcar/rsrc-card.c +++ b/sound/soc/sh/rcar/rsrc-card.c @@ -161,15 +161,6 @@ static int rsrc_card_parse_links(struct device_node *np, int is_single_links = 0; int ret; - /* Parse TDM slot */ - ret = snd_soc_of_parse_tdm_slot(np, - &dai_props->tx_slot_mask, - &dai_props->rx_slot_mask, - &dai_props->slots, - &dai_props->slot_width); - if (ret) - return ret; - if (is_fe) { /* BE is dummy */ dai_link->codec_of_node = NULL; @@ -235,6 +226,10 @@ static int rsrc_card_parse_links(struct device_node *np, } } + ret = asoc_simple_card_parse_tdm(np, dai_props); + if (ret < 0) + return ret; + ret = asoc_simple_card_parse_dailink_name(dev, dai_link); if (ret < 0) return ret;