From patchwork Tue May 31 09:12: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: 9143947 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 B472260777 for ; Tue, 31 May 2016 09:12:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A820E27B89 for ; Tue, 31 May 2016 09:12:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9C8B028185; Tue, 31 May 2016 09:12:24 +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 B8B0627B89 for ; Tue, 31 May 2016 09:12:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756598AbcEaJMX (ORCPT ); Tue, 31 May 2016 05:12:23 -0400 Received: from relmlor3.renesas.com ([210.160.252.173]:17358 "EHLO relmlie2.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1756118AbcEaJMW (ORCPT ); Tue, 31 May 2016 05:12:22 -0400 Received: from unknown (HELO relmlir1.idc.renesas.com) ([10.200.68.151]) by relmlie2.idc.renesas.com with ESMTP; 31 May 2016 18:12:20 +0900 Received: from relmlac2.idc.renesas.com (relmlac2.idc.renesas.com [10.200.69.22]) by relmlir1.idc.renesas.com (Postfix) with ESMTP id 783E0535B5; Tue, 31 May 2016 18:12:20 +0900 (JST) Received: by relmlac2.idc.renesas.com (Postfix, from userid 0) id 7674C2806E; Tue, 31 May 2016 18:12:20 +0900 (JST) Received: from relmlac2.idc.renesas.com (localhost [127.0.0.1]) by relmlac2.idc.renesas.com (Postfix) with ESMTP id 7142E2806D; Tue, 31 May 2016 18:12:20 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac2.idc.renesas.com with ESMTP id UAB14586; Tue, 31 May 2016 18:12:20 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'";a="212432565" Received: from mail-sg2apc01lp0243.outbound.protection.outlook.com (HELO APC01-SG2-obe.outbound.protection.outlook.com) ([65.55.88.243]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA; 31 May 2016 18:12:19 +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=izLRC4NIZQoG4VcOl/pnq8HvErGEqlj1n5sCW4JXggA=; b=WZqBmHGFcFnUx8wZN3vEva942gKSQo3RJIB+zmYLWdsLhLJJRn30E3YZKH8JWv4cLvVEh0fXredk6+CLxUeJ6iJiZLW2A44s3xNmNRorw0WowuzvxZc6PSiGf76itjpgbVlVXmzBT2dU+2XmG0rDmZSFFSbtiUeAqkok5xphrts= 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 HK2PR06MB1697.apcprd06.prod.outlook.com (10.167.73.11) with Microsoft SMTP Server (TLS) id 15.1.506.9; Tue, 31 May 2016 09:12:17 +0000 Message-ID: <874m9er40e.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 33/39 v2] ASoC: rsrc-card: use asoc_simple_card_init_dai() 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:12:17 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: OS2PR01CA0079.jpnprd01.prod.outlook.com (10.165.51.167) To HK2PR06MB1697.apcprd06.prod.outlook.com (10.167.73.11) X-MS-Office365-Filtering-Correlation-Id: c9f46306-d604-4843-ae45-08d38933a9fb X-Microsoft-Exchange-Diagnostics: 1; HK2PR06MB1697; 2:KSja7nBCp0RbqHeOye/UMOX++uLpR7qCFW48BX4NAf8TEZLYU2otx/eoGiPnZ/BzTBMI4gwigQFyDgfdJQ9l7X3ED2L4ftqbbgCOFJb1uUZFFW/uYEQLhI58OyHK7N31N5dqjJv61cg/+9dmhu3eWZc6fuQWWxDX+Ok94z35l3TWaZigC/htc5d5bpL+97N5; 3:hG9zBw0dN4qrJUcdWgBaaDbVpacHserNr9NUM0UmBGV8o69AHdcKSYVuBfpktgTpu2QHWIutmWeYTNUbe88Vhjyctv7nMov74FcnJYE9oufMAhHgv31ggQGKbJVj94T9 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:HK2PR06MB1697; X-Microsoft-Exchange-Diagnostics: 1; HK2PR06MB1697; 25:O9NDVv1pVyFaxqVclvEShpKxLUZNjyszvAcm8P//tcihldMwOx8DZDqY7bptRodxXgK2FKv9aPdkN5BHxKkXsPlGq/c3EtyLa9+CosN8O0UcGVsuX5l/1NdOr/5sqp3+plQQQOf4gbXiLRG6Zf8nQIoaiPEuOJnzuB0Y+yLe957QK0Zwx7m3Jv3E9zHxjf8KVp7B1KjK3S/4p15iZyDWHRGPQYWuPTeRlA6TKhCuVevUiE7nb24C5Fh+ZpX1Lr50EDXwzZ33RCpVO8ZUEVpF1bBHFVstvmhnoT0jXrSjneieFL5A4wRdERnbje+OAJ0dhCXPpBvh1TPdt+zaa5PJeCQUZEQZKSzd23up/9snQx/H9wJGuO/WibV7tRxbYkuZHiyh0q9prYLoBcj6IYMG9aZkihd6vWIgNLGNUrC9YlRYFYSJn7yeCA7FTffLA7rm14jUlGP/P12uXwtkjLelJhL/SWudPEiohWwPyKGO7ljuYxqngOmyFzo3XfGHg9qes5j+ha2T3vm9QdrJ9P7AYrFV3n7ndh155DcQpo0cbw2ZkMi/DWyS8iNEl9XozDwAQfZezeIyJV9AElGkGpvARBVi/7+l64OCgflNH7wrSL5F+UAEiDtBKjy1C5qyXlC541dMIKCAX9vVSqT3AtutxvxlUbU0ueQLgcqQtmsBoQUENYMheU/WaMn0rErE6ukA X-Microsoft-Exchange-Diagnostics: 1; HK2PR06MB1697; 20:1vIrQ2GD0sPr+AAYIpr+s7Qss4atejgNM79N6iWbSn9UwzisRlTmjzYlrk3nPUHJdiCUE2HAYhW2sI2Zq8ao7p4yEwXKe2HA7fkCi7IlOmoQ1fHR1/PHVDmO+KRvGKdHz0u8luMk5c5pz1hco9u7yvoy17vvBr1xQMuQsGiZhE+H/x/4e9L0yacJr4h+MNs4dQ8NMCwLyQDmTGSiBgOfOXadjy4virp+o6+n5IVTEnMIqtfc/r2ULFV137nT9QM9R0TeKTNTxl52llBiZWXIFqR7Wbha2JmV3Hs5IGp3WPJZyNVyumZY0+Bl/+cVYbrNlPUpknBG2KlagM1fpmdLWHGev5YhaPZ0d+XhezxCVCUiGTK+IZLwxC2CxYndbUUowMYIwYppnpYpmzPoDKAee0NDer8IVdLvxOs0Wxx16VzSZ5yoXV04ppTLXPDVwC1NELVPGt0H8LZRYzs5lVtStmKCkC4f/UsQw1TI3WGtfzD4WYtfCqdOG7a1bh4Ms7UJ; 4:B3i4BuSk+U3LPh8IHgc0KroAxLyF2BtwVUKksECiqOUdqD/r5huBb2YLSXZfemYfiJCiDFMS7ovb5erRvxfhBak8K7HMmNoHkdHse+IeMSjrktl/qi47PEBAC2wvFSywui8lSPWdRtUkiTdqAnCfoXVzuEggTYkUfcEp85LMDvpYMLZLmW3b8u7v7jIDVa9924Hx6XIAt+aZ3xNzo4WKvm0kFsvoFOZdpWVsMCPAuO5RNW0wRvp3f4VY7HBGL6V+0v9amsG3ZcENm2NNtP8ddaI9YFDBp42pizOZvU+n/MdJQzrOYeVz/me4m/+Clo3seACpv6nNmCN1+H2hN0Re3TS4S6FejF+C6KgWfERfZtkvpywSvGBu0ASALhlYki2DsFr+TjtD0ySe5fS4hzMWpw== 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:HK2PR06MB1697; BCL:0; PCL:0; RULEID:; SRVR:HK2PR06MB1697; X-Forefront-PRVS: 095972DF2F X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(46406003)(50986999)(92566002)(4001350100001)(8676002)(33646002)(81166006)(77096005)(83506001)(19580405001)(86362001)(5004730100002)(6116002)(586003)(3846002)(19580395003)(76176999)(110136002)(5008740100001)(189998001)(50466002)(36756003)(23726003)(54356999)(66066001)(47776003)(4326007)(2906002)(53416004)(42186005)(2950100001)(229853001)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:HK2PR06MB1697; H:morimoto-PC.renesas.com; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; HK2PR06MB1697; 23:K7rKsQnIQwQkJsBNx9wbxXrRUiDP/LqoS637TxOd0?= =?us-ascii?Q?VKs3mkYmO1bT/lWjcUp3ygiwvXPBDtBwNF6rNnscI2wjmHiKH1iGLC2wfWcv?= =?us-ascii?Q?MwpWb+9PXXs8rUbEfj5pt7fNnQpamL2uHft/l7zKCP47W47DlhPMRfRChgBy?= =?us-ascii?Q?vyw/qozcqOibvG9bjjM0TfiRDITKwuvCiE4Zcz9DvqYCcu/iFrieTtmWwsm1?= =?us-ascii?Q?ytIQSVs/UqbiYrRXEQjKsGEnEN0qd73j5xzXG6XfUJB2WEPscmcl0HQcXjoA?= =?us-ascii?Q?0w+yGn/qxiLomqSh/pLtQkH0wJDaP0fztODVOigGO7+SQAPmfhM1DKZuPsrZ?= =?us-ascii?Q?8UIjxntqv84nhqfBTeuAfLtZZbgoFTysCIcGGvyUHc+ZVLTfVuddyfKOfJIj?= =?us-ascii?Q?0GRkVHLXOuzj9n43+GfqV2kpurNkVma2UbP/AFxBt0+UDOQJNcyvMa44qMGj?= =?us-ascii?Q?r+OdqFK+9Edv7r34w/QL+8MH0mnaboTlWZo+0jSpiD2twbj43qoQ675W48mJ?= =?us-ascii?Q?cJIQWxYJyLFEKn5bdQpZuEvVK4eiNANZaeyykSPkxji14CvDhhWiagVgITJJ?= =?us-ascii?Q?rgUkTAFe5QzW4P1j7AZ1lfCy9wtNtQtrx1wmBUhmwjlDpPtKikDnoNx7ioC9?= =?us-ascii?Q?CpfyEM29C1G1hpR2ue4gxTV32ETEH+iRg7m9Tx1O+UuqPQvIHgKl4AYHNx5K?= =?us-ascii?Q?6XbP/2yOqS48HuHbodTBB30gd5wkmatC3TMiztQhoMOgWuKK17Jld8lg4udv?= =?us-ascii?Q?A4HOBZX96LIHnl3m8jnK/OkWoUGZ+lqGydwTIiC87w+F2YPuR82U9Q2stGoV?= =?us-ascii?Q?N7T/oHbzsI9OmQQ0BcsQ7Q8nzmtstbsUUPMjRzC7LUU7r4BYv4j7A5xm5HBW?= =?us-ascii?Q?ps4OwXNiSmgOJSzYa0JqD8Y2/yYqwhB4ukfr9poBzfpyqaZdOhICD/rAxXLw?= =?us-ascii?Q?OMOIiYGq71eUO7CzGVkzcurYhEIUnxpTDzXypp7UQ=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; HK2PR06MB1697; 5:xhyTOBC6JQITU2NuwFiZaRdIWYozFRvfg1VLVx61rQu7gwoOZLp18RUHhNseNwAArJUNMj3lbmAVF+vHxlbaThO2V8Mlbw3qErga3roE1OmdiIz/cEjSvjidBXC4bZ4D0sybkD4jpb8Fb11IPekvZg==; 24:EvA2Ylv/ThHGHJVk0KkKs+vfXWR7YzRkapcqY9x/EUyjL9Y2WGvT3IeIMYOyqzMTE/tVafegh4FfUljypub4uuCOtE88pnnTWpOsoqD3E6o=; 7:t+tMebunKBZbWh7B72lUNhfeaPAUNwmzPACX5jXBd97TVBUzFSfH0v3qn6MWUw41JKWBl1KpKtaBWsBPBTP5fDzSFTP4uoks1AUTlWTYHLrAE0COb8ju8e3SRQqU2qu4Xx+Cb7zJ0OiCnQIZr1tRPB59JUAEZjHlrJJbACsHHgmjZuidnENsmj70E9UOyobx; 20:TQM0id50w7/shsFc5q65eXS/IPTwdpghLAQTizOZlgHTYJD3D+37SBpIO4uDTb0r00EKDH6GDuvlBrn2MiFfxiTXBnHdNyeeMF0Zl19ByraWNUFcFUiaqQCmYhzRfZa84galMgWvOdXrJdBNGN2tr3IqHI6d0Y/6T8/vllyFGn0= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 May 2016 09:12:17.1146 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: HK2PR06MB1697 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 | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/sound/soc/sh/rcar/rsrc-card.c b/sound/soc/sh/rcar/rsrc-card.c index da3f219..e5432c1 100644 --- a/sound/soc/sh/rcar/rsrc-card.c +++ b/sound/soc/sh/rcar/rsrc-card.c @@ -97,7 +97,6 @@ static int rsrc_card_dai_init(struct snd_soc_pcm_runtime *rtd) struct snd_soc_dai_link *dai_link; struct asoc_simple_dai *dai_props; int num = rtd->num; - int ret; dai_link = rsrc_priv_to_link(priv, num); dai_props = rsrc_priv_to_props(priv, num); @@ -105,30 +104,7 @@ static int rsrc_card_dai_init(struct snd_soc_pcm_runtime *rtd) rtd->cpu_dai : rtd->codec_dai; - if (dai_props->sysclk) { - ret = snd_soc_dai_set_sysclk(dai, 0, dai_props->sysclk, 0); - if (ret && ret != -ENOTSUPP) { - dev_err(dai->dev, "set_sysclk error\n"); - goto err; - } - } - - if (dai_props->slots) { - ret = snd_soc_dai_set_tdm_slot(dai, - dai_props->tx_slot_mask, - dai_props->rx_slot_mask, - dai_props->slots, - dai_props->slot_width); - if (ret && ret != -ENOTSUPP) { - dev_err(dai->dev, "set_tdm_slot error\n"); - goto err; - } - } - - ret = 0; - -err: - return ret; + return asoc_simple_card_init_dai(dai, dai_props); } static int rsrc_card_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,