From patchwork Fri May 20 10:05:03 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9129127 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 97C4E6048B for ; Fri, 20 May 2016 10:05:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8A6C4279C4 for ; Fri, 20 May 2016 10:05:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7F2A227BF4; Fri, 20 May 2016 10:05:15 +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 4D6D0279C4 for ; Fri, 20 May 2016 10:05:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755752AbcETKFN (ORCPT ); Fri, 20 May 2016 06:05:13 -0400 Received: from relmlor4.renesas.com ([210.160.252.174]:47747 "EHLO relmlie3.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754253AbcETKFL (ORCPT ); Fri, 20 May 2016 06:05:11 -0400 Received: from unknown (HELO relmlir1.idc.renesas.com) ([10.200.68.151]) by relmlie3.idc.renesas.com with ESMTP; 20 May 2016 19:05:09 +0900 Received: from relmlac3.idc.renesas.com (relmlac3.idc.renesas.com [10.200.69.23]) by relmlir1.idc.renesas.com (Postfix) with ESMTP id 4622453509; Fri, 20 May 2016 19:05:09 +0900 (JST) Received: by relmlac3.idc.renesas.com (Postfix, from userid 0) id 315171806F; Fri, 20 May 2016 19:05:09 +0900 (JST) Received: from relmlac3.idc.renesas.com (localhost [127.0.0.1]) by relmlac3.idc.renesas.com (Postfix) with ESMTP id 29A191800A; Fri, 20 May 2016 19:05:09 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac3.idc.renesas.com with ESMTP id VAE09397; Fri, 20 May 2016 19:05:09 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'";a="211715800" Received: from mail-pu1apc01lp0021.outbound.protection.outlook.com (HELO APC01-PU1-obe.outbound.protection.outlook.com) ([65.55.88.21]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA; 20 May 2016 19:05:07 +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=wDqov8eJiZn0IjF4VJCJTFPoQIgoSrzj7tEjIIZcFUQ=; b=hh7AfiqRNvIejUVFYS2kcczUGo8uyGaX54KM58HhozlnpydzYttUP+bkhKUpWRRG0mvafleBFp404lACE3O7sp2RrKR+WSKs1IY5RHXcENCRXcUyY/SlBKR/O4gTnSr+G7oVwuhFkVLTOnaHELciZt87rr5uxf3MjVsW+h1EyJg= 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 KL1PR06MB1703.apcprd06.prod.outlook.com (10.167.63.17) with Microsoft SMTP Server (TLS) id 15.1.497.12; Fri, 20 May 2016 10:05:03 +0000 Message-ID: <87twhtoxt0.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 43/49] 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: <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:03 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: OS2PR01CA0047.jpnprd01.prod.outlook.com (10.164.161.157) To KL1PR06MB1703.apcprd06.prod.outlook.com (10.167.63.17) X-MS-Office365-Filtering-Correlation-Id: d664d8b7-cec4-4f51-6777-08d38096375f X-Microsoft-Exchange-Diagnostics: 1; KL1PR06MB1703; 2:RDOYT4s5BRhTZYQfkmiyhnEG8kOvIcAAQAAe1qryCwCHVkrisCzjXibX6Re3ebR/EaK8+bZCd3EWbuZbQBxINH9ksLlk/E3R5+KlUMRu/hJUJ3EruJHJ6VoPoIRoFjKFmIfAV8rznLkl1SZ2IrzOY9JrAkSw0+l6OFZp/+OlTsY07rNYMWivmKlMVhFusl02; 3:Fr6cbapcu4ss3QmBrWsiyeJhY8dkr0MVKdUzeAC8oW0XUqdKhOF+V7SVZY2jyA/FiVvsD5UmrVTSCPlU0WLU8qzfE/ryfhI9nYBWLKplob0kUk28SZ2gQp691PexzbZv; 25:EHJzYyo0NvY25tI0OObFwbZX6SYmzoZ4oTlN7TrOrcznhTvMXcThkG98gbANsKa+m/aS0iekwEOebHkdO5UxEmJgHc6Y9cQXjnBnA8imUkHV4zVdHb6fCdkhyI6dCQckSRDQgi0KUvRM77BMmTYY/PCqHcVkv+iyvIkBxeIyRvbd1Ia5qL6sJyp4KSyX5sTfqsi8lez4SXjDUkXy2NT+rpxqeNShQmh+1FgHe/pQJ1IQ4YJZs6C4GbNKTrfbEBuD8n/nPI1emoG8nmdHYQEdmtEkjHQEMl56Gr06nLaia6Oyf1fqaUni5bLnBwmuZBNG6m/f9yTlNCOB7rvX36MPp7YNwEJek+EvHfr3g1DlZv1/U9SufYx6M35AOA5nqUHgbmMOoupRIRSnmB/xurBBbQtx3+weXzE7A2m7UgYK8d0= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:KL1PR06MB1703; X-Microsoft-Exchange-Diagnostics: 1; KL1PR06MB1703; 20:oVUWi8JBg22f2kPTY3CS/dm96ItqNe+3D4Fc3yf7q+DWyhoQB6V0cElrxvP/G9sK/B/ohvxXQEhz1gnYqtrZYZIEB0FNO4IZJu4kS9u0t8+F8S+iNXBuWxOJgyF49PxZk6ZFa6ZCbgtnXQTpif9/XblYnq3lJFh1J8xHStwB+5IMMowdv5n1GrfxXpQ6ZGXsvYK5K41rj2WPfq1jdhOihxHa9n9gV5NEXglugPdf25lzmM8Ot2XsM21Xe20rn20yDoWcsy7Kenj85uMX2CxRubDvCElOeeUqyyTiSmz/b2DzPSjtlhbtPhOtNPuzdxC/QHBO18OE7DwPBdKlKRmLACgifD1mMm+lPBPYHFTubz+3UMwr6A5OZRc44qVg7vy486YZqDhcApWs3R1A+SdLyhBzkuMpYEXqlBEOHMX2hgEKAEZB+F6j8wy9il8YJ67FhdieyfrmX5sZUHCrP4sD6WQc1ZbfuKU2vCruTNzkdIOUXUQPpP+Im12AQF4ODxjN; 4:71vuTWZOB897zt785J5Mj93k/oLkk7XP/2MBSEmSKJPGhz3VEY+FI9y149sYiqZgc9F9gLsGhCzaOxm5vmbKz0NfWD8tW+Z6ngNuI+O9kYnZgwDGM4tfITXML1e+eFvJScH9sKMjhvTPBqo6qgA4aE1q+VaweJ9i6/e4YLp4TRgt8+PvN87S5SGqoCi4b9PK3oYlvTcs8P6dUGwNq6fl9sn1jQOeJNXLGd5Ntk5b1xA7B4gtMgq/1vyFBQkZdNGTNgtXybFBrLCAazaww/zafZyjEw7pHO7CR60zft+9W5fF5m92CqN4z+nlXobzH0RFzT7x/+RuqdSYrk7QKZ3ytVvyBURLwcyuPVknoRzXS2EBIFH6qJh2Dpk+QTcieaaI1LoMxomx0qG8dGcQdRgzKg== 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:KL1PR06MB1703; BCL:0; PCL:0; RULEID:; SRVR:KL1PR06MB1703; X-Forefront-PRVS: 09480768F8 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6009001)(76176999)(54356999)(50986999)(19580395003)(19580405001)(47776003)(86362001)(66066001)(83506001)(189998001)(50466002)(6116002)(586003)(8676002)(5008740100001)(81166006)(77096005)(92566002)(5004730100002)(46406003)(2950100001)(3846002)(23726003)(4326007)(2906002)(36756003)(110136002)(53416004)(42186005)(33646002)(229853001)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:KL1PR06MB1703; H:morimoto-PC.renesas.com; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; KL1PR06MB1703; 23:l710Zf16XPCR1kuFI0PHL3GknjfTW8VP7nJ7Ec84+3KuyAdVZkY5dPBf7+wcQT8tI6/GzTrqZ246ySe8ifPNfQlfd2GLT9EUasy47+lFjo/OEs8jjCpq0O3KkZgjE42DiZyLBYu3GLVYjMj2pbXtotwDcoNCZaMtZJ+PUvFet/dMWs/gA/B7537Oqx7bcycV+EwsKTmTbrjjMkT//hnzFkgykQlR10q/4EPRMEjpXACPMN5F+bqbXPVWERjwOfzw1ElBeNRWzHavBaaUaN1V+Yf3uUtrYhXxm7Fd8cWHw++jwe44/99iyeeTwbP1uBge2Kdsex55jSLwnLpGMufLF/VHEixrxOrZ/yAMoIgvkVIbYBIXd/kKtWIr6ZSvNMEHCQ348Hr2TnsvSGCUMbPPgNmMw51QxPkQY9z7o3ejHXl+FBcVh87tjgC0KILbxv5bCNJBZTFdIM2mqk/9C5IAqN/rREELFxLzsPt+g/Bs9Uypnr9m4hNLeAxLWzr8FRIh2nIH6S+kG8cGNwcUrg8ZXaRM1hF1Qc3mhfMjhHt6O0aQpqWmkQwd9FuCrOWWf7wTehu/ggC4sJUfD6jE+E7P5BqeISUR1Ovzkhgx/wkyvcXOhzGdXmoszv4EHfmZz8S5/6cJ0X+L91SN2bjc4K38TWG/U8Splm+YgPrtOqoBrvjqq8YTM+j1U1lp9EbY5/8cp7ReJfl6+T0ramd9gK3dHe5G+tZH1JFe1UZZDz7w+bSGQDUCYxsDyXxnZeVNwzo92DOmNoHyatnpXpbmDbzCLrC95zVaMV/dT3vnzxGP+suO5ZHVMgfQ/KdlYo6ZS79+uIpVuYUqGtc4MmQuRCD1qaTrCXZjY/jLDoP1HjVOy+k+R38G9Fy19Akz0GxhJJejq1ibNPrVvTB8sB21Ek7F3w== X-Microsoft-Exchange-Diagnostics: 1; KL1PR06MB1703; 5:ibhZPU5agAeB2qX3DGsDkgOk1WQOYL1ALykEI0WyhVgTGJRZB4njMajnWLHciOCfmOW3E/cx4m+UUrRebBweNfpiItM5pS3xxpe8yDLYejtFfO1EN3py+LvVRndBcCCsXuV0o/DS4FSzpLUh5IJOtw==; 24:KAGwEGnqjFnR1RJeDX2xrmRzecQxSbDmBPfE/g9EJU00TGwWkLgpixO1SIIlyfeve8Fwxir+XzUM1stYw8xJAVaqzBEbqia6/nN6bzF1NC0=; 7:iQk+6uzH0Fyhs94GYuU4c0cdZmKYhg4ofrg+ICikBQ8sn2/TxAx7oYv0NdVSjzWwkgJNTai9fzBW3aciPNdd/5KnLT8c/RtXTlCo9Vp9EEu02Pvqa6Z2dDtG05uExhBhhUiifZikDxRTmtBgdmbBmIPlhn0/Nv6SjORkYa+SQN3lzHc81cqe6u4bnPddLZBb; 20:EQ60MLrErZFK6PyRrAtvvn9pU59iDHCVS8PyXa7+WkCQuUgvSHQGVTzT+nEBDHM7pLMks/3sKboaYe2QlLo5qXuvx83InROgk99N0y6TDcZcSHGUxUFILfsAkA6hOGTZ+xcZlMDU3o7tLHe+RP3N32nE2ww7zclyRtrSspNMebQ= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 May 2016 10:05:03.9476 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: KL1PR06MB1703 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 de59a4a..08fed4c 100644 --- a/sound/soc/sh/rcar/rsrc-card.c +++ b/sound/soc/sh/rcar/rsrc-card.c @@ -94,7 +94,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); @@ -102,30 +101,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,