From patchwork Mon Aug 8 09:29:19 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9267459 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 E75BD607D6 for ; Mon, 8 Aug 2016 09:29:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D68712679B for ; Mon, 8 Aug 2016 09:29:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CB59C27D64; Mon, 8 Aug 2016 09:29:26 +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 424002679B for ; Mon, 8 Aug 2016 09:29:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751320AbcHHJ30 (ORCPT ); Mon, 8 Aug 2016 05:29:26 -0400 Received: from relmlor3.renesas.com ([210.160.252.173]:21535 "EHLO relmlie2.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751158AbcHHJ3Z (ORCPT ); Mon, 8 Aug 2016 05:29:25 -0400 Received: from unknown (HELO relmlir1.idc.renesas.com) ([10.200.68.151]) by relmlie2.idc.renesas.com with ESMTP; 08 Aug 2016 18:29:23 +0900 Received: from relmlac1.idc.renesas.com (relmlac1.idc.renesas.com [10.200.69.21]) by relmlir1.idc.renesas.com (Postfix) with ESMTP id A406051920; Mon, 8 Aug 2016 18:29:23 +0900 (JST) Received: by relmlac1.idc.renesas.com (Postfix, from userid 0) id 976198002E; Mon, 8 Aug 2016 18:29:23 +0900 (JST) Received: from relmlac1.idc.renesas.com (localhost [127.0.0.1]) by relmlac1.idc.renesas.com (Postfix) with ESMTP id 909FD8002D; Mon, 8 Aug 2016 18:29:23 +0900 (JST) Received: from relmlii1.idc.renesas.com [10.200.68.65] by relmlac1.idc.renesas.com with ESMTP id UAK15642; Mon, 8 Aug 2016 18:29:23 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'";a="216938193" Received: from mail-pu1apc01lp0023.outbound.protection.outlook.com (HELO APC01-PU1-obe.outbound.protection.outlook.com) ([65.55.88.23]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA; 08 Aug 2016 18:29:22 +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=pSah7C03nNT/FvEJHFuU8ti551e6yRgfdx1MtNmZc2c=; b=jTcodxhTFVG1xzv4PE57GVWwFHdGiJte4HGac/eOQOrGCrQ4lvRnRpkSIwNyAH3T+/7y2IZTWYR6RPa3UgbkavjU5hKprhzvlUqWlhUrf5GfooZaucA58+8lYpFsbq2CmYmcNrlAiEIZS2cblYIAr/QmOmtKpzKxNlEERqk4MiA= 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 SG2PR0601MB1455.apcprd06.prod.outlook.com (10.169.106.21) 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:29:19 +0000 Message-ID: <87invb1uqw.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 135/159] ASoC: codec duplicated callback function goes to component on wm5100 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:29:19 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: OSXPR01CA0059.jpnprd01.prod.outlook.com (10.167.144.35) To SG2PR0601MB1455.apcprd06.prod.outlook.com (10.169.106.21) X-MS-Office365-Filtering-Correlation-Id: e672d039-876a-4ae4-354a-08d3bf6e79f1 X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1455; 2:w3BDVqeyP3Cnbshy9mXjQtFvzQp8Lm7xb2YJa4kNW7hPhwmUAXysn9otV0M+RS45OVGPrp2NzsMwaY9Uiy2/NqvItCciIUOZ4Ia12QFb72oS85ZGd9nzID/7XCi/B4T4lb20TemTiziTyIGVH8/B98UA275rDrPeQHnOrjyRtEg6uW6mCHIq+zhQaM72Ena8; 3:+1SB0P6Ars9zeIceYBgGaleSvU2cg/wl8/q3FWSwasQwCrvd787ErIV8tQwqYhO5mEBrLaidbwAdQOLo/shvy3Fpe/Ih8jopayX/o/UX6Ze6GoZpP9Ye/67xsJ8KSLOr X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SG2PR0601MB1455; X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1455; 25:JqkLK7XSx+YAvwKmsxE4Fag/QmSOAo2gnwwE3iyA37RhiOK9Xd7WsPqKVyd5xdq7yj3klHe8Y2uh4xm6w4ITemTFgWixsfyllYUEIc2CCKA7AlYr5p78bOJH0alN7G23W+BrWcgAHcPCCUR3b4IIkaeVryFgyMsuRQxRWiuw2sLGGZSfvVQnei4wnbuCCldVJxyTDoOUxXU18E7EkSveXbdPBmYJiHsH/L0dDheu7cAOzCUoJ+gxdztQ5Kpz894fG0Qngvi4BhrlEVD/47rIISveQQicCfLws2QV+Q8VZQpxwAtac8SafblMq/lqBmM5sdOyywYuimCViNvOKUSlp6xOS6G5nRgFdMtUdujA/EVZeJo0PJvAyI6Df46qVXOQCH+xDFXDFfBYV0eQpvlvoE6sNrS/QjCnbNnakL/UxRLIG74+5FS6ZguWg+2LLNfz/g0p6oYISii+a4cfQi2l6ItbiwZFSxofCATyxV8f0EVeMfgIdi+u1eo+ojIbeBwBwYr/ZTK0EGw8BvPLBh5JJHZfeujCNEcAXufdbeR9lDgcpSIwdL+KXJyn5uyisXr2P13fNmIYzW+VKGaTi/k18p/5GpIdRHjvF357tNH5YqJd+rbwawJIshpSlurQiooa4xxBrpCN3rXVA1h/LMf4yJgsCvrd9SsKAIarnEB4fMEC7GYVzYcdU/xPH+5pStqiWz5Miqv18mbawsFSpkhR4Q==; 31:DtiGZKfOUVWnXOy3pyAL6z0zz6dfICGnAO6ZuAoxfwkjdnMptIk6B6Inreka0HYqz2d8vrFyugdW97yOSTwL4MoAOGtD3AjQLSdGah+2XzWJYu+FecvVLLpUwefGc591tJIgFSZYkIa46/eYYM5ELth01n61VQIp7fXBt5tGJdc4uXexryVrw/mhxddNKfDu3STOLsv5tVB UhmdyeoKJxRb1iEANqy9pohfFor58xro= X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1455; 20:n/tApyFD8NOPNARiVJbRgiBHV9ok0bTzTvZ5tiLh05L176cuZHbMgFa17QxSiJCi1wZFAwmhoapekHBR3SbCHG+xjHECdV9S/SeHy0FU7MevpyUG52gBkQ3nR5iBy/p2oMEcmeXJqHY9bCpqrmtHomWplg/1hLNCWlYMUG5el0wu+AlCPBJevatnBCVXy1I+R3m7GW2Tlo9Yv0QyKAJID82hkLo8r8WX46Igy7/nSWsvSdg0zvAjnzdbwVH9WQFtL+L2vXi/ag5Os5x84ZG5aU8SarluZGMRAVj6AFlOQT3qrW0B+2LHqTO63eiJp404HMilSwPxvyzmCXmxNnOYhT6t/HUjivS8jmUsr6U69U0fgjBf8qCrKxd0AlNbeLuFkzecQpRuwi7xysDMUgTlB0gFwxUu5BdosF+jPXrEHOErElT/xPsPvlGhle9yT3m8rYsST0sCdmX9cnbgrdGhTF1v2XFl9bCRpVkQWUMtfhFyZTSauj8Pxjjgufaxepfx; 4:JS/0g6SppRHw/8H4T5mzG0AWeaKj4e0zduD4s3WNtX6kXQf8aK4OX6JHq9jzczVXff8A3Coonr9LeiPvZJ28Npmax+xfGNHWOE6g5fyh7sgakJNmfQayrOdOMzsn5WoZ0UT2JMHnuqx1c6xQoV1cl0ua4sGtZ5NsO5tsTdyfYkmjbTI5D2Ax1RArlNQkS4DDAPmMDJCECb+VbTBkvHPbt3EdFPmNo7FlN6ETlwWSTSSX7ZXMyvGHchQqMLVMC+FQ+Zqcg6cg0ujcgMXD9yLj5inKJAwYjNGzKB47f+U8HmpP1djN1Zv3aonTGMh1IkUjALzpXegqM+kxq1klspVgQte4j9TwMfybkQB2b/wT1ANfv0LslfaaXV0ykv31oBNT8c5XGNiaUp5btyODWANpGg== 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:SG2PR0601MB1455; BCL:0; PCL:0; RULEID:; SRVR:SG2PR0601MB1455; X-Forefront-PRVS: 00286C0CA6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(189002)(199003)(586003)(33646002)(83506001)(4001350100001)(92566002)(86362001)(229853001)(69596002)(46406003)(19580395003)(97736004)(50466002)(3846002)(76176999)(54356999)(2950100001)(6116002)(23726003)(77096005)(189998001)(50986999)(101416001)(2906002)(105586002)(68736007)(19580405001)(8676002)(36756003)(81166006)(81156014)(110136002)(4326007)(106356001)(53416004)(305945005)(7736002)(7846002)(66066001)(42186005)(47776003)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:SG2PR0601MB1455; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SG2PR0601MB1455; 23:NbKoer/5It5boTFe2eSG1jICJ3n/hlMH1d4hc+X?= =?us-ascii?Q?jzcTzHI3z/rl+1c0h89qbxwvbzPMBJi5kIqNh7AP98N8cNf/lhnWcs1FaQgd?= =?us-ascii?Q?TpyqDwQr7XLqp59IYs1vlXNYZ4vZnu++QwovpPhx0owVmhaWS/GFu4xWIBn3?= =?us-ascii?Q?fZjPW3qWEnPucLeXO2dpnILIYqqljW2SpSPnuQ1fEoDMrUi/oHa8ktv7toR4?= =?us-ascii?Q?491dGAdP1kYLRU/v611ZVUIY4gZ9Skg/GoHiOY4iTOKfr/B9fADaz8z39GOG?= =?us-ascii?Q?88SGQ7QprASASjMS214iMtek358sPLtz2uuBnpb4oE/QeOMnt3eXRiDlirMa?= =?us-ascii?Q?6hfHBKUIgf8QgDETLwjrAKG7cfg8yTaeUrm6MppIyIIp/jPv8lWL0klClW58?= =?us-ascii?Q?Jx/P5bNsRl/KFT6ZdCNa5mOW+LAtll7f1Q1VlUQQyh+ZtNGiXwO/yqO0W6xl?= =?us-ascii?Q?w1cScyw2LE06s7GCdcXgEO/lURfVjLMrTXrQbLoiva3w8bRauyfBgahQD+J4?= =?us-ascii?Q?7Q3HrFjSTSsQGb+KPt4cGKB8x+ZA7om9H+X+x7QZG6cnEZkGTG6bIrZUR4e1?= =?us-ascii?Q?SFnTRurOPadwyGOzoW+fF2sI6vuefhkHzJjuttbW4sP63WN/FqSm9+Vy7Vcb?= =?us-ascii?Q?I5Y/0p7ThY+6yaZ30HmreqOqdsXusMwoqNk9DN5ZxiNFqB73dbV1UNzbArlD?= =?us-ascii?Q?BqYkd6BptCKO0nOFab30d5d1OW/4fY9WK6Imdre/n8eL0GW+woflXEa8cLe8?= =?us-ascii?Q?mVyolomB6ocBkBEOQ3VkHte2/5WtUjRhZ9Om3DtW6oNbAYKqgjlVJn+QzNkl?= =?us-ascii?Q?OQnonSgueGtYe8r5vlsyHISKT+kGVH4YYvOsyRRFOeotMFaDSMoBEhNqPfOq?= =?us-ascii?Q?kuhgfOnTXZIfo9PkatMJgojwGD/Yshh34zgLsZr/1DrdVFE+5qrT9x/v+qT3?= =?us-ascii?Q?epkJBWc38pSB2RF9/xS4jqPNzEoi7Pq2U58duWusJ02/g+sciOxzDjXxcK49?= =?us-ascii?Q?VPWDvnKGTus0jmauV3lwQimYQyFHr7ykmtfzY1D/qgQanWkziyV/blLdP4PH?= =?us-ascii?Q?h93ys2Sk7weEad1gzRcLKUgl2a9yWDj3iK4X1Nz0tbrM9JVI/I4KLl6TdCSB?= =?us-ascii?Q?muTs2uo7XJBZ1XSQHfVgZRL3NRkYA1bZp1bOuY42mcLmEfOaxAMGR3g=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1455; 6:elMkvWCoLivcdprggGS88JlmqImVChpyyDEg4/9pPvJ+7GHNmSHJrcJMUh7PEl8rkZISL4W7dUVIzFGf2YyiSWXFPXRam8pcUvavEafoSdnSvPlSROYTHa0eqvM2VfkIKBtD90lMVcm/KbwCgeC/AjbQ8yA5a1rjdKLwmFIePodHupoy14o+glsn7+25A9czahCm5JG3ucSAt052u3u3veA15/QxeJkmRQr4I7xe8KkWoubKTql2D0bwq0zoUns0Fm96SIbqChjc7tCuL4XrYe7jh1cGTcaCJ86Jq8FYqPEE3ZALtw15HwwLRvg59hYwNpxddQ66TAbQ6QKktb5Vkw==; 5:kEYvyHiFHIQIJsV4ls1Mxvi3ZT802derI8IFqvzTCuA2ZM70xp6D4amxlaf13Y5wp+FVU90e7j1F9ZYMiSZ6FUWdLpjG2PcxzaHcoxIVQYK75ZU3N43RGIDYGcSR4F7hTuUyXn0jOTRsKvgZeqJenw==; 24:ZKV0O9R9mdPodRAzyyblcFD20R6BQT9UGJD8hljEmgAXDKDgsduLK3XEadS6sNEJkmd2NoJrlQepxhF5iNjFKhUylYmCEBewccWJ3E+cZRo=; 7:5TXlRNYzpEu9SFOz1u7OoFCh/fbu7npw4RI/De5u4VnBaY0kSEz31PBFGfLaG5ZB3LDwPtzRzZRceDU8ZMWtCl0XDISq41f6Nsrxfa2gpyLPfXGGOmIPwemg/LvtpwpOQKrdCBhyT6tf4tQAPs6xHu1ZySqspB5w9qAXww+XN3IaM9MoQhoXuK0wlE65y5TsWtuANUEQGYvy30Cu8rG0aDkU37vpT7eHBL8OBw/FC2ia3yYa6Br6POky+puiwNs8 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1455; 20:T5LIOgWeNqCa6V0KcKyPYv0D6iDuJpMYCrE7oHe6vij8hy8+ijZd4JgS89zapghFY60xgEIV8mQGUjFdKcuM61j7XFWlGfBXjGpmGnd745cjTdxneHxMTbUakjljF1XgbELZPlbrgQsjeTRFT22d/y/8HkmNFMkeRGrgCg4r6ZM= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2016 09:29:19.5945 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: SG2PR0601MB1455 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/wm5100.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/wm5100.c b/sound/soc/codecs/wm5100.c index 512a9d2..8cbdf17 100644 --- a/sound/soc/codecs/wm5100.c +++ b/sound/soc/codecs/wm5100.c @@ -2390,12 +2390,14 @@ static struct snd_soc_codec_driver soc_codec_dev_wm5100 = { .idle_bias_off = 1, .seq_notifier = wm5100_seq_notifier, - .controls = wm5100_snd_controls, - .num_controls = ARRAY_SIZE(wm5100_snd_controls), - .dapm_widgets = wm5100_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(wm5100_dapm_widgets), - .dapm_routes = wm5100_dapm_routes, - .num_dapm_routes = ARRAY_SIZE(wm5100_dapm_routes), + .component_driver = { + .controls = wm5100_snd_controls, + .num_controls = ARRAY_SIZE(wm5100_snd_controls), + .dapm_widgets = wm5100_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(wm5100_dapm_widgets), + .dapm_routes = wm5100_dapm_routes, + .num_dapm_routes = ARRAY_SIZE(wm5100_dapm_routes), + }, }; static const struct regmap_config wm5100_regmap = {