From patchwork Thu Aug 25 01:57:30 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9298581 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 37F0E60757 for ; Thu, 25 Aug 2016 02:02:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 258C529157 for ; Thu, 25 Aug 2016 02:02:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1A4A629160; Thu, 25 Aug 2016 02:02:46 +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=-1.8 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED, RCVD_IN_DNSWL_NONE, T_DKIM_INVALID autolearn=no version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 73CA529157 for ; Thu, 25 Aug 2016 02:02:45 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 8B8162670FE; Thu, 25 Aug 2016 04:02:44 +0200 (CEST) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id B6E3F266BBE; Thu, 25 Aug 2016 03:59:52 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 17DDD266601; Thu, 25 Aug 2016 03:59:52 +0200 (CEST) Received: from relmlie2.idc.renesas.com (relmlor3.renesas.com [210.160.252.173]) by alsa0.perex.cz (Postfix) with ESMTP id 2DF2B266BE7 for ; Thu, 25 Aug 2016 03:57:52 +0200 (CEST) Received: from unknown (HELO relmlir4.idc.renesas.com) ([10.200.68.154]) by relmlie2.idc.renesas.com with ESMTP; 25 Aug 2016 10:57:51 +0900 Received: from relmlac1.idc.renesas.com (relmlac1.idc.renesas.com [10.200.69.21]) by relmlir4.idc.renesas.com (Postfix) with ESMTP id 684A24B061; Thu, 25 Aug 2016 10:57:51 +0900 (JST) Received: by relmlac1.idc.renesas.com (Postfix, from userid 0) id 471A68002E; Thu, 25 Aug 2016 10:57:51 +0900 (JST) Received: from relmlac1.idc.renesas.com (localhost [127.0.0.1]) by relmlac1.idc.renesas.com (Postfix) with ESMTP id 40DBE8002D; Thu, 25 Aug 2016 10:57:51 +0900 (JST) Received: from relmlii1.idc.renesas.com [10.200.68.65] by relmlac1.idc.renesas.com with ESMTP id LAG31736; Thu, 25 Aug 2016 10:57:51 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'";a="218060740" Received: from mail-hk2apc01lp0215.outbound.protection.outlook.com (HELO APC01-HK2-obe.outbound.protection.outlook.com) ([65.55.88.215]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA; 25 Aug 2016 10:57:50 +0900 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesasgroup.onmicrosoft.com; s=selector1-renesas-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=yaBYbapTVj0L8RVL3BUWDLh/Ke/rmkms2fZ0phDPacc=; b=fFeZCaJeyl59MUA4ugQkBYEcn+0fDJT560oa1VNeDsnibRDcp/Yw+zMCphdboMMPF5eL3bCtqC5Dvr724sFT5cP1SVTYQ19JiJ4v+SxNwrxhqGEvfIjKgyFxYN5cnro1vEriepx5ZV8QOp8GiQL0Vq11djYo4ygmw3jsl1asOFE= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=kuninori.morimoto.gx@renesas.com; Received: from morimoto-PC.renesas.com (211.11.155.144) by PS1PR0601MB1450.apcprd06.prod.outlook.com (10.165.210.154) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.557.21; Thu, 25 Aug 2016 01:57:30 +0000 Message-ID: <87h9a91uue.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto User-Agent: Wanderlust/2.15.9 Emacs/24.3 Mule/6.0 To: Mark Brown In-Reply-To: <87mvk11uxo.wl%kuninori.morimoto.gx@renesas.com> References: <87mvk11uxo.wl%kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Thu, 25 Aug 2016 01:57:30 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: OSXPR01CA0058.jpnprd01.prod.outlook.com (10.167.144.20) To PS1PR0601MB1450.apcprd06.prod.outlook.com (10.165.210.154) X-MS-Office365-Filtering-Correlation-Id: 23acbc0d-68fd-4009-11ee-08d3cc8b2c63 X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1450; 2:sofxQINamnBGEN680VnNjctDqKL7XCgSITF4ELOHGqGETZAlXENYqDX9QQAME/uCNVtIJdPg1S3Wt9abnO4bItBrRDvLT+vGBQEtR8koUAa1h+SDBOF0WP32hVz7ajRbc2o1ADkBz3X6Z+Zf97/ipZkvt934AmPa+yTjYkEy4qFyHQToEuqp39IZinaHeoUH; 3:ioxNWOtO4ROeWTzGWdXNF7RvK/HizgHy0GXYpmNG7R0NFf44Wu41/5fBy8KVwdoa8EDnyDxjrO8ge6b5KI7bdHjAIV8vUXM8beBrfWqGLG3inLa5Pt5n/qMU1cK2ltf3 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:PS1PR0601MB1450; X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1450; 25:N7nI2gM50dA9UEw3La8oUn85jDED1xjmZb7vWjk1K2kj+ifqfdsgtCtz0xj0x2oqLKeXArmSzqdpZwbmjugbFc64+W8zuLPtyVcFVRWe8vBlaR7MBVvv5gdXjv49ud+yAQe7ejDSjYL2Ru+/QT2x+u8Ioh8Rpidro+HpGsvIy3BG5m8VNmHG/uqZjBEh2KEp1uQJZsNeJmwto2j8oLX/vQGStDkEBqW6q+I40DxDX2FX5/7Z8s31n0gy0usmc8wdrgYYA+VjImmGtvM24TrPeQ+ZVCkDPP0fHkK+UfaHGCbUI4GIdb3jPEZrVDg1WiR3VutPlRoG14Ed4Z+aX3/NZ1ZIttdQ5Aw96DqsgUpCnNoYFio/+oG2MNXu+/G53AaHfM4WVhFyIWa2DC1CC/JBiRER14aTkgI4Z/ALZVIcVK1VtkF5dQklyJSd/aIjTyTdHi9a+My4iD4EkuJQzkQ6euSqc1/sy8umO3b4I7d7mBneY8IkbNeiEYtwcO4yCftBZeyURdZACTbR3Tj3x9LnUfAmubPLboMF54z+BpqcDn/uNDGenDOnH3pHo/KICO2GnrM2qTmLDevROBdU1Dh1BwvTZDECRqrWI+j4EInrcN0TGJy7w+So3jxktONi2wVT1RezPS/TI1QFdfzBpTvIF/lWDb+lgfTRtOLTK1Np2je1Fc07LZ6+RE/++uDuAABZx5B3jubGFcyEk7wpSJXkNw==; 31:qUN3VIDKMUwhTOVoVrWTvXREfN/s10UEaWMlgQZ4OQR3SufzEQQzoFq3WEBdEhvrCRI6qeC+yOIAe4Hk2rdMZeV7aRHxb/wCT70T9bcR6Nxqvr+nVF2I/PywFVCNyc3OrXeXkSPAqRZQ72TDbV9AfCg6MRfeMJTKt+rL0gmc50ff8nU/S4lminKPPm5o08vjrtHJFpTXzhEeua8vS8Uf7y0zFK/rrO/RRDnkm0VHvt0= X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1450; 20:L5RfJ81pqggsBElYrK/vflTntLzUimggUXlWCjOo7UW+yFn4ak2N3D1CKunD5HFAZrab+n/elcsD6PaJ4lt2GQ0LGrn2DeV8h6RU7i+q0NvpI+HMHL1BdRaBdEefSq8wrI2/f2PlRoeuO5iltK5Hxa9n0Ky8N16MnmdS+U/PHIYJhNal0zFckekLla410Fh2fNepPkPqdRDo6UEMzY3+PtdoZOjdrEUrwQNfoEUHsrxSQ9J8xnkPZYFVULXEYTNu6d4NQ1QzsTWBo2KXfHnG3OsIKgqaRV2RGr8JyKx/7Y13BBsAcxm9sx1eyTtAhI9UcRV/jdYheVT75AvhCBTtoZiKrZe/vxyGfuKy6qJHk5b/qkCeXj9gcu5lfB2DplDwDMZj0lEIs8rW7c+WWQn5VxEQmJkgIx2qr4cYjUjb6SxgHM8SPOvx1bXuPyyaXCzy7LrxYNPe8nAXP5d1+Wo8xuz6KsU10JCD6Z80OTNiAoT6h415OSga77TGbYnAeU1R; 4:Byz+b2A9JYwxPvXjzFHOO1zNKFhgKa4q1VmtbVc4zJJQy1QR1zAUqJuhXSx4VWI/daZjubEEUXkRj6GfhUgBJm6/pD4EzBoAl2p1gIir4QXVS1FKnjfEFvsLsvCCXv6mW+a/5EgRAZAx9awGoWE2MpDjrVnuEv6+7NDEnpCKG902lstfuLKy/s8PJAPoNU1nUj6JvHtgxmhFlMxFE09evjtEBfe6/1CxcDCVVsfOFufzAMPlCs625ZXzMRx8NpMOP5ZlTG4mq2dLqQk52cElYXsBvhClHbcqFYarLt2nsgjIFOCBPCUhYrFd8ND7mLres7Tcs/iBQoqX/J9APvXZGi9jvWc2AgLM/KHAhg2aLyvDPZwut38ZYCLMpjH87/MGpsY++Wm7/akrHaXB8sofLQ== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040176)(601004)(2401047)(8121501046)(5005006)(3002001)(10201501046)(6055026); SRVR:PS1PR0601MB1450; BCL:0; PCL:0; RULEID:; SRVR:PS1PR0601MB1450; X-Forefront-PRVS: 0045236D47 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(199003)(189002)(586003)(3846002)(46406003)(6116002)(97736004)(66066001)(33646002)(47776003)(110136002)(92566002)(86362001)(305945005)(19580395003)(19580405001)(4001350100001)(36756003)(77096005)(83506001)(189998001)(53416004)(50466002)(42186005)(2950100001)(106356001)(81166006)(105586002)(69596002)(229853001)(81156014)(2906002)(50986999)(101416001)(8676002)(23726003)(68736007)(230783001)(54356999)(5660300001)(4326007)(7736002)(7846002)(76176999)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:PS1PR0601MB1450; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; PS1PR0601MB1450; 23:NsZLhWDLmy3A9b6drTrCtJDkRs1bTuoMvOquA7C?= =?us-ascii?Q?c+31mn8/g9DmoNR3NO2UartL2B5L37uqmrWMsdQp8RldCuzfda7yIBZRQk3O?= =?us-ascii?Q?icckuQq7dVmrUuRhed5SiAteS4qlNWvorWlaYjcToIncnFZCubxlvl7lK7z+?= =?us-ascii?Q?nY/kqHASa9CGzrjETKsIaTj0cniK4LNssw9wZgoSXiT4MnoxRHLKlk3SqlJ/?= =?us-ascii?Q?G6o5rqSF/KrZBf+cSjfQqtVMK1jd8dj0o4ZqLufBJHoff+GZM7tc/TqcK9bx?= =?us-ascii?Q?fwsuZIs3FIeCQkcmmtIuBi51MAq4GcULjDve+jNHt5ABiUUlvDyq7PYALlJ1?= =?us-ascii?Q?R71UdldYS1LXcPZecePrAkZS0dxazBh4rZtIne4X/zg2gku+S5SmeGfhqB3U?= =?us-ascii?Q?2PTyVYcMDDnGg6JsKamZL5rp+ew/5WntLilhJ3SpPIOZ+IEE1THIAs0JC6st?= =?us-ascii?Q?fViE4xBEZQfiUDwHkD68LEUbWPbVVhNVKZVLCgZ2W73x+T065KegrNoWztRA?= =?us-ascii?Q?FkYQmVvJMwJ+2NZ7QAYUoRatoQ4UnUJ/27H//sPW40iBIdjLiH2tfVe1EQEE?= =?us-ascii?Q?O2m8PAJsZ7Zt+ynLSxdgxO65N5N4JCZWsnKWguPgoQhtizEF6pM4OKgyiM2s?= =?us-ascii?Q?NcWkZ3Qixaht4UKdApE2tRzuuPiy+aXquJbePPj+Pra+oL6zz3BwK+P1X5ip?= =?us-ascii?Q?9qq+VzbAlAkHo+zrBJkbeD2kX8PyqkDxfF4CkRevXmJpRlHL38V9HWAhqJyX?= =?us-ascii?Q?4BtbNzv8Lejfnzo/wCD5JQQjAUp9XBeNtldt+0aEhPx9rG+SG2aVDmLrB/Co?= =?us-ascii?Q?FjphaM5IOEKq4bD1pLZT3NRoWl7yo5ZDQG2eL3Y9D70y0LaX8J0bsGo9ukUx?= =?us-ascii?Q?PZ5F5OPAzRod2NMMpailMAjpW6ckPpDYn8h5Chny4LJA6Cb7AWvefqSOLOkV?= =?us-ascii?Q?4K9iA3BHpGAm7IVjrkRsLnhkWd2eOFh8RDoLH0vt8fTzi3C+EvtT5DIE7Uai?= =?us-ascii?Q?xkKRMXBqHLdXNjXHFO7GoFDckTNDT59jQSC3pzaHbQbd2TpUt6OHpbUfVAxU?= =?us-ascii?Q?CsXp/pOcCzNuj7OETZv+8MaJ2VQCk7Iw5ftXYSFacBvLzgcvXtW5kRcUbQ3a?= =?us-ascii?Q?rGKSijJCTyUMJ6L0QtHChJgWVtsyingmLG5AsDUhaEDs9xCMi6phvMZOW/Bn?= =?us-ascii?Q?n77PZxo4+Ou9NPO2Rkz8QBlY0c+CV87i5nWaU?= X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1450; 6:QTOcMgeLkpicGrCHMNSe66SdomazoEoFe8DMmMRpWOphu7QBRTLYo+n50Gt1jhCNvzKn7DT47dgEPVg95/mDnA5aonewqhGrB9q4S6PBR5PAdNj+uo11ZScOwTYVP/bx9/SAL5FYS8BCoY4kkkCke9kI/jP2zXUHxMaIXGfym9R88EDbEnXX9Sz5WwXOdzzda823RFKpTQj/6KordhsZWNx5F7EUMSBzxYftTT54zly5cgXxR3FcTotburiC9IMaCoXWNLltt0QoE5tSKIKalDl7W2QyPeOIsIhEySgIsNm9RD4SY8T05hfAhRTIs+YhoeiQGaahStVcNDs8vYgzFg==; 5:DmQzzOxr5sBmCGn3HWM+9cvPztYftbYLspDDUce46dSfX6rfWzduqsI9d6Y7CHaSsDnotjpFEIINXveCXfimeS3LTt69rsJbqJdUNNh2hGNDNWfx2O2f8Lwada6yWetHrCnif7apxSyXNgJd3818Dw==; 24:10qAkBBn1nIPOk5Bsz2VwxP9h26ywHQBKAfMCSw9b7JFQD7yHZaj82Vr894LVMCwRDMARyvp9zNwadekU5FZr4nYh9h5kAB1+vkSCRpH+ac=; 7:RJsBjzkljxwVxMYD0Wg+nmAX6rBmIC1M2bUdw/Q8M/iCck+ivKn68VRx+G0qRx+0w9I6uALobip83eifbIPjmYhh5D3FgQWiH0BJG1m+XsZxPR4YRCSFHvsh6eZhDC9H1Jdxx8zLHzZHLbby9YFi6AZKH+YCMxqo8eXHDMzANN1YBCRaNsx17kNem1i9Mrc22rNebVRKflzmnlSQBelDVzH4xMoTbRlhexxyyQR2Wj0O+zoLkLifLbtmp0yTXRIj SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1450; 20:/h+tT8VC3Ij3qykSN5wHcFBwKGNSpX3e96lkNTDE1JsBFRxlXGIY9uJBn3aKBQLwdvxMaTxbMvCHHWk1SynaWR/4uECBkbLlXe9Yj/5xUsKw++v+hHthAfseZHrwthWArGKXgfW01rbnVXjRVxOsvNwTdHx7HtCCmQFIia6wCGk= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Aug 2016 01:57:30.2429 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: PS1PR0601MB1450 Cc: Linux-ALSA , Simon , Liam Girdwood Subject: [alsa-devel] [PATCH 4/8] ASoC: simple-scu-card: tidyup asoc_simple_card_parse_links() method X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP From: Kuninori Morimoto Current asoc_simple_card_parse_links() is setting dai_link daifmt. But, asoc_simple_card_parse_links() is doing it. This patch clean-up this point less method Signed-off-by: Kuninori Morimoto --- sound/soc/generic/simple-scu-card.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/sound/soc/generic/simple-scu-card.c b/sound/soc/generic/simple-scu-card.c index 83add14..2f40f9c 100644 --- a/sound/soc/generic/simple-scu-card.c +++ b/sound/soc/generic/simple-scu-card.c @@ -110,6 +110,7 @@ static int asoc_simple_card_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, static int asoc_simple_card_parse_links(struct device_node *np, struct asoc_simple_card_priv *priv, + unsigned int daifmt, int idx, bool is_fe) { struct device *dev = simple_priv_to_dev(priv); @@ -188,6 +189,7 @@ static int asoc_simple_card_parse_links(struct device_node *np, if (ret < 0) return ret; + dai_link->dai_fmt = daifmt; dai_link->dpcm_playback = 1; dai_link->dpcm_capture = 1; dai_link->ops = &asoc_simple_card_ops; @@ -205,7 +207,6 @@ static int asoc_simple_card_dai_link_of(struct device_node *node, struct asoc_simple_card_priv *priv) { struct device *dev = simple_priv_to_dev(priv); - struct snd_soc_dai_link *dai_link; struct device_node *np; unsigned int daifmt = 0; int ret, i; @@ -223,14 +224,11 @@ static int asoc_simple_card_dai_link_of(struct device_node *node, i = 0; for_each_child_of_node(node, np) { - dai_link = simple_priv_to_link(priv, i); - dai_link->dai_fmt = daifmt; - is_fe = false; if (strcmp(np->name, PREFIX "cpu") == 0) is_fe = true; - ret = asoc_simple_card_parse_links(np, priv, i, is_fe); + ret = asoc_simple_card_parse_links(np, priv, daifmt, i, is_fe); if (ret < 0) return ret; i++;