From patchwork Mon Aug 8 08:50:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9267079 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 C4DF46075A for ; Mon, 8 Aug 2016 08:59:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B5C922793B for ; Mon, 8 Aug 2016 08:59:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AAB4327C0B; Mon, 8 Aug 2016 08:59:16 +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 ACEE02793B for ; Mon, 8 Aug 2016 08:59:15 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id D6337266F58; Mon, 8 Aug 2016 10:59:14 +0200 (CEST) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 4834B2668FC; Mon, 8 Aug 2016 10:53:08 +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 8ED052668FC; Mon, 8 Aug 2016 10:53:07 +0200 (CEST) Received: from relmlie1.idc.renesas.com (relmlor2.renesas.com [210.160.252.172]) by alsa0.perex.cz (Postfix) with ESMTP id A8CCD266A4B for ; Mon, 8 Aug 2016 10:51:03 +0200 (CEST) Received: from unknown (HELO relmlir3.idc.renesas.com) ([10.200.68.153]) by relmlie1.idc.renesas.com with ESMTP; 08 Aug 2016 17:51:02 +0900 Received: from relmlac1.idc.renesas.com (relmlac1.idc.renesas.com [10.200.69.21]) by relmlir3.idc.renesas.com (Postfix) with ESMTP id 5DBEE501DA; Mon, 8 Aug 2016 17:51:02 +0900 (JST) Received: by relmlac1.idc.renesas.com (Postfix, from userid 0) id 4276B8002E; Mon, 8 Aug 2016 17:51:02 +0900 (JST) Received: from relmlac1.idc.renesas.com (localhost [127.0.0.1]) by relmlac1.idc.renesas.com (Postfix) with ESMTP id 3C8E08002D; Mon, 8 Aug 2016 17:51:02 +0900 (JST) Received: from relmlii1.idc.renesas.com [10.200.68.65] by relmlac1.idc.renesas.com with ESMTP id TAA00792; Mon, 8 Aug 2016 17:51:02 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'208";a="216934827" Received: from mail-hk2apc01lp0211.outbound.protection.outlook.com (HELO APC01-HK2-obe.outbound.protection.outlook.com) ([65.55.88.211]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA; 08 Aug 2016 17:51:01 +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=GVgIqAiy0Je7FIfOklYGO8lsKSMnkfcA2t+ZdrNMrak=; b=bIZBZdyfkE7onk4uNyB3cZxJhs8HuqqD4+yL/PXbaiX5p2w5lrAv80BQFvu7AL8C0A/ngOGyYheCZNc9pPEamP274tkuKJed4bcwGFns+tkuhH5tpD5/950kYbuM+e5SaQ4ckVH7HVKGUIlDePe5fKzcW1N9MdSHgxBm4ywL+SI= 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 KL1PR0601MB1448.apcprd06.prod.outlook.com (10.169.69.26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.549.15; Mon, 8 Aug 2016 08:50:58 +0000 Message-ID: <87d1lj8xd1.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: <87wpjr8xld.wl%kuninori.morimoto.gx@renesas.com> References: <87wpjr8xld.wl%kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Mon, 8 Aug 2016 08:50:58 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: KAWPR01CA0036.jpnprd01.prod.outlook.com (10.165.48.146) To KL1PR0601MB1448.apcprd06.prod.outlook.com (10.169.69.26) X-MS-Office365-Filtering-Correlation-Id: 1e7b6536-6987-4aad-8ab0-08d3bf691e47 X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1448; 2:wb7YeYVOPb+bsIb2TYU9iOKIsly5jXzFPdsXUUgv5dB1sc4Jj1L0sXOOJap4/ZIizCB2txUksMXGS5c69qbC1T0tIL2Jw0adyXX2bTTUoGnGzGT92KtsC3JRGdgv6wmBERfSP3hMuTwWkHPZ3UmmE9xdc2StHYi9TrSIr8Ej8xv5co74xKg001YNkBbI0ESi; 3:VeJ16dtd6pNZh/3uFum6+/ArIuGCvstOQYnyN+gYwpZxyFvN8Yw7+ZOxS9owvvIsa7Wfzqo9cJnmXpAAyPfToFfQXKSvPG/cMHtYNC6w87u9zPgoqWRWpldSYTLMl9bC; 25:cAKSKsKZCqxHG0M3DHaXkW52YkCvGg0uQii4lWWaaFIUCSW67JPqjmOJz4utZzBh4soRwwJrMcuAX8KTPwGvPkkeVhmV0Lsj8AFWatfq2QS66xXctazlFgXjrN876vHfPqtp8v56UTmT7FUuEY7gQAL4tXwCcJ0k6JW+292R1NqTXX8/eLCuaCynTU7AELe7H/jYXg4NoV2VYp6/kbOisSs6xifOFXFGIs84fP7ItQvtBADc3jMK6M2kHiZODPDK8xHlkVTUsqLzhfCfM/a9jZyO+ROHXsmqrKE7VNhDmVjwpoBl4sJL1O//mIb2Tog+e1u1UXX/7QeIxW2npJua723uxdtzMTeQUoRfJy4NnsKRKlxKwqqGVSwIYIxQ4S1wq1UWOQnnarWLbeZ2aTQ99MYGeV/5YWNSj4SZtDoNyiM= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:KL1PR0601MB1448; X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1448; 31:6TIX6MhZcNuX6yr3vWZut5MH6UtkDPD00vnkrGgU5p2qggRSiXbNGDcCsMVdl/GaXVi7TpNLUd4x2S9Pasq8cTq9n9Q33Jsa1fdmRqrwfJ5bZresr83e7CoPPGNoOs1IzOE2cl8jKPRgUMsgE1fNr1LQZsVDN8ekh8rYYAYDE3x02v6WdjUxyiQNVZsMwU51d5W2MFevJIvTVAwCW/btg0ixUR0b4bVfsFUBOe/eZS4=; 20:M62jbUX+arGtaN0rO94LLM1EbG0DL69JEUPWrUlpYA/sXWfHWPMRf3OZxKIpu0vrK/6TCOd1pqmaaHQ9N36rMLy+n+y86D4KSgWdTJJtaoeqp9DEq1ughiavV9aokxx+6BKN126qC2Hu/HXUk2nrwFn9yQE8nZutIgbpc2zLo+qBm+QkblnqdP9xOFXHQEsPXls3moilfCSyC3vnTtAmMdgHyu/mLSbF8OjxP3KW9Nv8NXZ4PWbrfrLhcqac81KMaBz2A/peNznHhAQgb1+oOLO4KJbLcAbRsyV+REBnR+MpUsiFYJc11jBA1jA+CnKMdTTuE9xmNANc4zFxskeB14Q4E4+w7SCB3K47NsF4U0StmkDCHT1IKuuG0scQx5sLaJ1u/fYiIiO/xoj+g8KNgEze/oAdzoCApHSY1NrvazPm3xkAXqckbahdapPiXFTOiVuqsukMTDmLUGRkbI7DyB5zG1z8TZ36Cj4wboRqmlAXulHP9yzLhg9slFv2Jk3r 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)(3002001)(10201501046)(6055026); SRVR:KL1PR0601MB1448; BCL:0; PCL:0; RULEID:; SRVR:KL1PR0601MB1448; X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1448; 4:4AkU8U1emvzQAbpeA0RTRH+Fux7L20AX1q04WgZ86qLhCpUsWX69WB8ajA4nNNqz6BX/0+AfuMhr97NfrtL6ZySz31pUQsgpMPx0mbCOROLPPf4wK1i6jJnW7cf1ByQsWQJVkExuWG/mb1j+Spf0z6s/VcmNQYvQPKaJyYKgEYBe0M25iCN7smifjbnVfAP0uDIJizz3D811cio5CM/clClNMgZzxnhzWEDkfd/8YLEA5Opk1Np6I1wZU4EC1e2lcTWK/o/93cj2zQJkGMWa46UBmOZQFrqjnDC0QfdQyLPVKDkqo811LbJLQdUog8aZzKsb9574Sal/wIIAvK9V5qZ/HYubIh+TAULj0LmJuFrJNixjDp+6I3CWz83CjeQLhNoSphu2tpPEMrhSGV5H4Q== X-Forefront-PRVS: 00286C0CA6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(189002)(199003)(53416004)(106356001)(68736007)(101416001)(97736004)(42186005)(3846002)(189998001)(46406003)(110136002)(6116002)(50986999)(4326007)(54356999)(36756003)(92566002)(23726003)(66066001)(4001350100001)(76176999)(105586002)(81156014)(586003)(86362001)(8676002)(77096005)(229853001)(81166006)(50466002)(33646002)(2950100001)(47776003)(305945005)(19580405001)(7736002)(19580395003)(83506001)(7846002)(69596002)(2906002)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:KL1PR0601MB1448; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; KL1PR0601MB1448; 23:Vk+nOllPabemREoq0kuZcCvZoFLUt93qLELWmFR?= =?us-ascii?Q?JjOAOeUxVY164VMlFEKx/7/JQIkIU3f2TpnKwCE++bjSPYjLUMpyt4e0HSbD?= =?us-ascii?Q?49l1i0OA5/XkXkSfY7lX5QOldJDxzVxnwv6YwWqUMf4sMVCS//AiqG2XUH+/?= =?us-ascii?Q?zrMIpI0Wml3KV7Hc79BC94hqKAbbROkiSqlt1MZFiGP5TnGgiYORzzNSX7A3?= =?us-ascii?Q?s6N/CaDr3yPQ7j7nsXy2VStKa6VFkO4MLFaKJ/fTsDbDOe9mGhJPXrxK+Igt?= =?us-ascii?Q?Sf5EMjD/fBCliguFNb/J1+v7ozJAAw4VaKrNO+hfMQNrtQPvd+zvmdUQttJ1?= =?us-ascii?Q?5aeQOl6jdBKZyXzZxg2K2ExsE3j6wqMLrwVi7F3nxxSWj8n8Q1lvWCRO7VNA?= =?us-ascii?Q?fBnMFHlN7PcGhMFS/fRgXtPSJNvjlXkNFJZ2PWSbVQ7MAq6p6kuMXX/PmJtK?= =?us-ascii?Q?VHREWVecVrcHzez0vlGU3lcxKRVRgasFVZ32Q1wbMaYf87x9gSsBc4jR1ejL?= =?us-ascii?Q?6L+9JL8H2QXkjnKS/fOx+z2cLdxy4bNu3Cdnwu7HN6gvQ/cbfY4a21oODWkE?= =?us-ascii?Q?/BQ9jL2JihRErehqhOjNlRuPYZr4vG69Wxm/lipBiddFYQTLDC8J+p2V1Je3?= =?us-ascii?Q?5pwczoGuVzzfSuQ1ZrdeXdO/8MJiMg1VM+znQLHC28iyq+lR+mMBvCwZX1fJ?= =?us-ascii?Q?UgG0szyKc7GxxYzuCGmtRB9D1cyvGPDEwv8Q8W2tMqTeVSqU1+gZ4whL+aSt?= =?us-ascii?Q?6tv8s2f1uXZRtYfsEJ75zujIKaTh3+Na0eZh7YAx4ehAv+ZcC8/BJJmszWqb?= =?us-ascii?Q?GMhLaDTBBo44tiZxiEi8lne2vMT1uhLDI81FguEKj/lSV+TjnTsJ+PwAO3LY?= =?us-ascii?Q?IPvyv7QO+N0OaNa0ClrXh3M7WWml2Cm2wRXYgJ/C4voJiLaWG79XGd8gcKVQ?= =?us-ascii?Q?5Ypf9Diegx49nB62Wta5hwtJlN6tvg/qTvDi5QC3NxoSiit+Djp7I3lhpDoZ?= =?us-ascii?Q?0pkSn8R+S1TsAQ9DKNPVETftziZNmMaGXZHAQ8SU6VSQBOajluj13E/X9/Lw?= =?us-ascii?Q?wYSTVkmmtNQYHole4YBV7HOVA0lnuZBNlNQmEzjHxlltwWm0VZ4bY6MRpxS0?= =?us-ascii?Q?5PD/sVcFQa67UmQK5YxvyFtYhAX7/SK6buhWhv8pOlnhydOondgbSfw=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1448; 6:k7Vsa9bbUoPDkn5/O5cOMDPj1YG7rMMIxFcco621C/DrgC5rT2zokUsBmNUB3tNnBUEwIc4IaYHKOgt/+A4HvVLYZ2FtAIXX1ZCvcS+WIg3iDHaX6i19j4igOjHaOTLFcZldNmYDbZPqwIvAY71aDtV/dWALDa3+ZBGgyKcw5UFxqJZNpqHEHuik7ZUd5n9WRfKVqhvTdfQ1RWCjj0eAthBasltXw9qDQ6B0KKAo4rhEIRkuZ0eZJlrAzHuI/qeQb4hdVRtcM2AXUfc2EjqlBI0SKAXWcNaxmcJplnqFUKNLPZtALfE30V/ztjTyncDdHwQyjugGbb1/ARiOKp0AEQ==; 5:pdwpBUQ9CKG8YKDv7YKTGVBr8OfX5PCb75iW9OnbZFdaq4go7c7nfErpAxl+Gq8jJcbG+ZkBhdD574+8zu8xEj81tLQ3E1tP9Em4sorZ+PjuobO6F2H+ggQ8qQGLfknomLuor81JqA34Ijn+mT8mOg==; 24:/rtS6PxjZRaRp5T9UsnbC57b3BMYu5uFB4TnuKamJ4BbPCRe4JRJ2tfvusyMjfSOOUm8V07l6eort2n31D5tscxu3OF+Lz1reJ7szozbZF8=; 7:C9O1EPyMJwZZVztMqH1+la4+nCKXXFJ/FqTYp5bdmQMAnlQH3gyrHlph66dDl7GpK5PLhwjJXOvTKgwis6IeXz/OljTZzaDDPvamlshuDBGeKKc5LDSYE1RAFRUzFOlrStVJIFGL+UHDMZqAw2RhT431zueq4cV0vfiC5gzZwf8CbMK3/ZORYsxAkzmIj4rk0WHkyY6ZB8EsuZhyuJK/qNwaPLVnE8tFVsf5AOliA4UduKbPP/yQQjrHeSg7ihkD SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1448; 20:4FdFN2F+ZgKLXmrejCOtRIHowmOuiP/TmnREyDpt7DRu+wW+Zdr1r6EiWWNmrzserMjlDGfjbF510anX5hHDNLCJp6Hub/8qpiE2KwwUmBCm/vPnQlr2HBcvJpWRa0idyqJoA9QUh3eyvOwvG/hmzZ9aEoy+DPi5+rLstyNyIL0= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2016 08:50:58.3642 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: KL1PR0601MB1448 Cc: linux-renesas-soc@vger.kernel.org, Linux-ALSA , Simon , Liam Girdwood Subject: [alsa-devel] [PATCH 014/159] ASoC: codec duplicated callback function goes to component on wm8731 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 codec driver and component driver has duplicated callback functions, and codec side functions are just copied to component side when register timing. This was quick-hack, but no longer needed. This patch moves these functions from codec driver to component driver. Signed-off-by: Kuninori Morimoto --- sound/soc/codecs/wm8731.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/wm8731.c b/sound/soc/codecs/wm8731.c index d18261a..545fc9a 100644 --- a/sound/soc/codecs/wm8731.c +++ b/sound/soc/codecs/wm8731.c @@ -632,12 +632,14 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8731 = { .set_bias_level = wm8731_set_bias_level, .suspend_bias_off = true, - .dapm_widgets = wm8731_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(wm8731_dapm_widgets), - .dapm_routes = wm8731_intercon, - .num_dapm_routes = ARRAY_SIZE(wm8731_intercon), - .controls = wm8731_snd_controls, - .num_controls = ARRAY_SIZE(wm8731_snd_controls), + .component_driver = { + .controls = wm8731_snd_controls, + .num_controls = ARRAY_SIZE(wm8731_snd_controls), + .dapm_widgets = wm8731_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(wm8731_dapm_widgets), + .dapm_routes = wm8731_intercon, + .num_dapm_routes = ARRAY_SIZE(wm8731_intercon), + }, }; static const struct of_device_id wm8731_of_match[] = {