From patchwork Mon Aug 8 09:34:40 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9267517 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 6F175607D6 for ; Mon, 8 Aug 2016 09:34:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5BFA72679B for ; Mon, 8 Aug 2016 09:34:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4E10926D17; Mon, 8 Aug 2016 09:34:47 +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 E35132679B for ; Mon, 8 Aug 2016 09:34:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751320AbcHHJeq (ORCPT ); Mon, 8 Aug 2016 05:34:46 -0400 Received: from relmlor2.renesas.com ([210.160.252.172]:62352 "EHLO relmlie1.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751259AbcHHJep (ORCPT ); Mon, 8 Aug 2016 05:34:45 -0400 Received: from unknown (HELO relmlir3.idc.renesas.com) ([10.200.68.153]) by relmlie1.idc.renesas.com with ESMTP; 08 Aug 2016 18:34:44 +0900 Received: from relmlac3.idc.renesas.com (relmlac3.idc.renesas.com [10.200.69.23]) by relmlir3.idc.renesas.com (Postfix) with ESMTP id 208CF52A63; Mon, 8 Aug 2016 18:34:44 +0900 (JST) Received: by relmlac3.idc.renesas.com (Postfix, from userid 0) id 0EC951806F; Mon, 8 Aug 2016 18:34:44 +0900 (JST) Received: from relmlac3.idc.renesas.com (localhost [127.0.0.1]) by relmlac3.idc.renesas.com (Postfix) with ESMTP id 07FE91800A; Mon, 8 Aug 2016 18:34:44 +0900 (JST) Received: from relmlii1.idc.renesas.com [10.200.68.65] by relmlac3.idc.renesas.com with ESMTP id UAE30118; Mon, 8 Aug 2016 18:34:44 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'208";a="216938598" 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 18:34:43 +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=r6zP+p6RPqISCHRl09CuZ3C963wphJSOQgjkMuZSh1M=; b=BGOd3ufsIhKuDHkYoGJtT1w6AXquLG8IUgDvPBigJbzq+v8dcMHR+4y/k7fE3F1pV+iMD15Fc2a3ZbX6PoTXeOvs9sJHnsdXD0UvVRh9UhNalPO1o8ww974BqtlIHxstE4y5liH4DyyPDuMcJwN/9EnxrIlSlPYYfuZ7rNZfERY= 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 SG2PR0601MB1456.apcprd06.prod.outlook.com (10.169.106.22) 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 09:34:40 +0000 Message-ID: <87shufzk4m.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 153/159] ASoC: codec duplicated callback function goes to component on wm8997 User-Agent: Wanderlust/2.15.9 Emacs/24.3 Mule/6.0 To: Mark Brown CC: Linux-ALSA , Liam Girdwood , Simon , 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 09:34:40 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: TY1PR01CA0043.jpnprd01.prod.outlook.com (10.164.162.153) To SG2PR0601MB1456.apcprd06.prod.outlook.com (10.169.106.22) X-MS-Office365-Filtering-Correlation-Id: 584c653c-5056-4272-77f2-08d3bf6f3975 X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1456; 2:PaDWejpYUYH4BdMtvRMrdaysAnthzQ5BzDfvyeovJS9whiLjFgQ7rR9hC6pYfBBkkuC+Q3NBCZJbukqt43NJkC7AczqfYEQ/T3vVspMD5jZ/ikFkD7dPEIsEBeKdByqUQxnFTgcG9EQpkdhQYn5vUJwQwTUmMSgcXDQTqwdU5Vmo2K1zJ1W6jcf3ri+kWd24; 3:rclNGhzLgPL9sfjTuOPuZMlFpVMyd7qYsLQ5OYwJVyTR9lNXaF2cMm+1YZwdfhu1pmGMlSZnHZJ5GwnUw62CgD5qmyzzW7M7BWjUb1X8CaGZzt3e4TeR9K6DZjUPhh4o; 25:Xib3KgvPBVeUWTqiKQLw08gSZJxWMiJi8qi9YZlGpOJizzrbuslxBA+tI+NGFvAjQZ+V2EuTCTZIZAySaB81WUVU0p+rEZ7zbHEh8wy6kPWJlU6dq+trRiX0bZxV0JHhYHnvc0Rm3548P3nCeclLTIPkpTsDFevPKuRqi8zenoMKCW3fXzFvpnLcKc/6lX0FRiyZyTIKzXH04tksE1Kd+3H9GJ/pFj+UDpIF8mQSif8+6IxS54Tm69FHE2A435cjBd90sQZW/dcAdIZ8SlkcHqrQgYzrlAkA15/hlZwE0jJIdacFy1QslBOMR8Jua7AoM/knDmLWMj350UaQzAWWgGTwibL9+IFTZTQMcI8OA+wsIALe1Vv8XNPc+A2MTbwmAy1RNJ+oI+7krRD0QI3YtKlEWlS1EOjeec2ff3pl+BE= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SG2PR0601MB1456; X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1456; 31:eEM5po7cCVuQ/6hzOgsmRfKzEnENf0KCMsiELfWpPAfv0meWCw/A9x7uhQ/yd9QO3tQyW1rKXgJXWkAG73Hf+Ugw1u7Ku6h21ZHNg6ehfyzBz6Ka2eFWd1t4FPInzo8rJcRvUuSuMy6bnIOy60ZrKGwWW2RYD4GfK7UNbbk9k66tnIetqvHIaiH/zMWYs2pQ4dTf2Cs3YJLkuCfjoXzzZzGCgsTYrXbC/Be5boihQe8=; 20:KnixE/1I3lcgwO6KRgCHUnB82Bt4e4H2Ptm3C7+fDNL1/ajLDYDEplFvgowqXWLFg6UvBbu4RXv13t5AA673VjojqltrlO+Nyp62bXMREwB8EJznkp742AZSYYZmUILacYMJKQT4ou1bVEsC3kUzEfDs/DkmWfZcEo8LNVLsaZR3QCvlHO4YF9FVo04QF4pE2cguN7HsVnXFjd1o6QkVHcL3g7jc4lvZnjCyxdE4RXzSuwuEBY3bOf43s9m6cUItZKJ+EhKRpVyYXwTvW8ownFmTjf3vI09TiqCnuGM38abO5DNgiwqtPPgttzO6MG1iEKGsdoKo/YQ3qjLejzH0XfpFQAE4AXwVkFre8aEd4R3s2YV2lcjv51aLLOaWHuRdM/Bk2lfZ7WeSV4YrSobhm7UUgyLNo1Xh6shCONYwAJvccCgj273y0LsHq5umKr+N0DMd8qlKFUmt2fbEEKLTc49ZVSettBCq3OeAZcTikJ1fYvvfqmHoClqxx0kCHj7k 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:SG2PR0601MB1456; BCL:0; PCL:0; RULEID:; SRVR:SG2PR0601MB1456; X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1456; 4:bp1TAzDzDAGs4/QDivLalpLWvrpJJ7PUbUVeFRrEDQX+hUhVYu2+EHm0kHr56dHhhF80Fwu7ZVB1U8FrmAsQkYZ2j3YDh84Vj/pRzpGza+0eQaETo1QIheolUhnfYSTawJWEjo/R+VMQfYFwGc+m8doabyALGhMPVIhmOfLijTFwAmDB5eplj+KF9CMjXaSKzI2clIKIBmsYX244pdTGGQPSwolJKxLw0/qzd/OeBF/dWIXcjMJrMU4rJJCz+QlhW+Efenc36W53lY1M08mlYbR6KbmqP0ztIE5lCIPzNoXvLNJeiJXyS80h0BP7U8RFIWmLRtftr7vixZLiL3GT/qoXboGkBdjJfwSU/1xy3Vz3oZuMsXqKD/Q6KDsvr+whxzEbQUL5NNhEPjZm23EVGA== X-Forefront-PRVS: 00286C0CA6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(199003)(189002)(105586002)(101416001)(53416004)(4001350100001)(46406003)(42186005)(66066001)(97736004)(47776003)(92566002)(50466002)(586003)(7736002)(110136002)(36756003)(189998001)(305945005)(7846002)(86362001)(81156014)(81166006)(3846002)(33646002)(2950100001)(68736007)(2906002)(54356999)(76176999)(50986999)(8676002)(19580395003)(19580405001)(6116002)(23726003)(4326007)(83506001)(77096005)(69596002)(106356001)(229853001)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:SG2PR0601MB1456; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SG2PR0601MB1456; 23:E+e0PfhTs+9EB5hwnknTtAowVs+J4UbA5yiI7+D?= =?us-ascii?Q?vtrwN+T/jvLGm2qJl9YJbSAcqOqKXrrlZ1hpR1cAJB0GajGDa86nd/jHYVcJ?= =?us-ascii?Q?7Tytgr0P+U1MhyW3Hr3qFAiZ0yXaojSkfDnmYph9W7BMKvTsV32m5lYYXXlc?= =?us-ascii?Q?VqtZLDjuOZAP+qJWBR7syZ/wdez+u5XtQY8ERtN5dbxK7BXWdUqpCaxasUZY?= =?us-ascii?Q?XUV2EdWguUVHS4zH3A48CMzK3CbH+Anqe/GQ4+9rPvcEhbKqO3mraS/tKyHP?= =?us-ascii?Q?VdAyKiLTeLJI+XO4oOpt5ijACGZePOlB/yVCZDxfpgS+yEZ3UoAUDk6YWb8c?= =?us-ascii?Q?6zhwirQVcnsO3xClU7EbBA2mXMSw8NBzrv5MtIzLDik4YSZU2sD6vCTn22r1?= =?us-ascii?Q?Y+tM3v1SsKX5xpeDZXcZn/swbWLehUhds+si8HcR0BvhXNPsFvMeDs3olq9Y?= =?us-ascii?Q?cdznlGjgo79MituCPPmsZWs5HRRRPoJkUFns597S8hrxPrEW2i80bYUzpoEc?= =?us-ascii?Q?0eQNsEg+ZY8ol35DTriJGRDzq0zNtXhm+hZnoVolg0FxGvVNSsL5MExwp8k8?= =?us-ascii?Q?gyxT2mXsdAalqEtx+08fVt0ed+bVvHixt2GA6RZ+JL4LCuk20MZ1vvTnkpdo?= =?us-ascii?Q?+p2OdXjTmMhsMobzCbCtAPzV40Aqw1AgRRoiqFTVT9St5w0GToL1/nHYVfq7?= =?us-ascii?Q?0v0wd/+XULE84h99QHPhSTiv4RPrzVgyE8m/R6zJSl2brZLrI2OywERKCZXa?= =?us-ascii?Q?7ppyGxKoYH4usA4TmyD228NU630oPrPx6cSo9SPcdNbeRmV+AWJmF1WoVXje?= =?us-ascii?Q?Zf6qVrXhwOGbztP4Oo1wIBYkPbmpwuaWSlrymrNMaqw8xa6mYVP7uytUlitg?= =?us-ascii?Q?S4bCZi+9sv7/1vhICviHoLxRmVRQLIB+TjAQ9BIHIvyvFLgM9sH1uxA8Rvd0?= =?us-ascii?Q?hhiEeg1SqLMzeFjGE5KH0eE1CjO5nTiWUno3bMMwAFy3A8MHEFMmZdVzAN9/?= =?us-ascii?Q?Z26wRm7CYhSyTPoGRmgwOL1/tZPXSkwYQGAjjEZYmeIoWN9p8uKaaxHV5UY6?= =?us-ascii?Q?iel8Dkro9caIJvI/u1PAdGyrpEZqhLpQheT+Vs0mKUab5tekPiPt+Nrx1DOO?= =?us-ascii?Q?DbBsDRvgYPet6rxXTNt7o+j+Xtdqu8Sh48HiOXmMu/jQQrLZRR8QwRA=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1456; 6:7B7kifoxoW8tcpkElT8QYSVs1k8lG+OXY183YXyo+4ddAbHcegcviAJM4aMbexNFIY1fuNH2AEUDnIfgQDqzooe52B7+7ldnBvOQZH4n+nzhcv0/gRMaDyzWjmfSzQHoeOt/+uneCSybzhYWZGaYb7Mi51Bql+91WM99jmJQjqs01x/p5nKUrAhl9N8MlWuUd/ex5ly9V6hCoXvHc0IWDoWSN+Y3+4FADMFqo3UyE+N9xSJF+KeK02Q50EMw0DHXa7fiMU1NshGN8ZmxsZ/Hv5u34EO/FJ5YGYOLy6XBBTowte84HnpZ82xPZ/7fADpxpLpcfpzUGxW1/HSyT7xvMg==; 5:G9OuPclW85psYN3z7rQ3xUnKfXr9Nw7W46lZoMRv4lRvLeg9RVxJSHkuuoYqvV0qG2A776O89RwRCqEy7P/3HFmI3foPx38X0lDj5NnuEEThKAojhW+KQ1fFnGpzb+E3vNsM+nFtaU9BB/3TFbXKLg==; 24:nf2QTDhzt2EXEtAB0olic5d8c9J1+pwVA7nO8Apw1J4aa0gcaxUjdXSymYiROHEI35NGmJ/e1/UuauXrSJohx9eLVzU++xPskOJlIWrK1bo=; 7:Ed8EVA9Ssm6k3NMb3cJr2q2CxMC0iYVrzMwX1sSuwL/OA+6RaLq/0iOttQ3mkZRkrtNmTnhyFGgzK7El8xXuH4mhjpt2F9aJ3YJCpfS1FPcbVx8EcaFhiDps70gcOd7IephRSL0eKpK1FkYvKxBwwO8QvKW6Jc+Ljo/ZNLmACwyclTv+JiWRt8qXDwF1iiNWvQLYz50KD+K75LJJss+slfsMeDL181un+wfVyBEaKpDti9zHTBNRkQMeB1r1WrVG SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1456; 20:mhEDxvWxcjACTuCG6eWKalVS38H5+Y9/m1uyO7co9a1KTd/I8gmMzPrQV0H8exjWnDj3P2RDvqbWJeaQIFpB9KfmflWoP4PWhEiE6eMGvIsXy6FVg+0BOvEyGVMDaokyw0lqsjBUqQ7BylyOM/sqiaKTpMaqMzblJxr9RqCG65w= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2016 09:34:40.9822 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: SG2PR0601MB1456 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 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/wm8997.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/wm8997.c b/sound/soc/codecs/wm8997.c index 6b0785b..cf23a6b 100644 --- a/sound/soc/codecs/wm8997.c +++ b/sound/soc/codecs/wm8997.c @@ -1105,12 +1105,14 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8997 = { .set_sysclk = arizona_set_sysclk, .set_pll = wm8997_set_fll, - .controls = wm8997_snd_controls, - .num_controls = ARRAY_SIZE(wm8997_snd_controls), - .dapm_widgets = wm8997_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(wm8997_dapm_widgets), - .dapm_routes = wm8997_dapm_routes, - .num_dapm_routes = ARRAY_SIZE(wm8997_dapm_routes), + .component_driver = { + .controls = wm8997_snd_controls, + .num_controls = ARRAY_SIZE(wm8997_snd_controls), + .dapm_widgets = wm8997_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(wm8997_dapm_widgets), + .dapm_routes = wm8997_dapm_routes, + .num_dapm_routes = ARRAY_SIZE(wm8997_dapm_routes), + }, }; static int wm8997_probe(struct platform_device *pdev)