From patchwork Mon Aug 8 09:26:56 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9267433 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 3E0A060871 for ; Mon, 8 Aug 2016 09:27:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2E4A526D17 for ; Mon, 8 Aug 2016 09:27:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 22DE527DCE; Mon, 8 Aug 2016 09:27:20 +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 BF59F27D64 for ; Mon, 8 Aug 2016 09:27:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752063AbcHHJ1G (ORCPT ); Mon, 8 Aug 2016 05:27:06 -0400 Received: from relmlor3.renesas.com ([210.160.252.173]:45807 "EHLO relmlie2.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752020AbcHHJ1C (ORCPT ); Mon, 8 Aug 2016 05:27:02 -0400 Received: from unknown (HELO relmlir1.idc.renesas.com) ([10.200.68.151]) by relmlie2.idc.renesas.com with ESMTP; 08 Aug 2016 18:27:01 +0900 Received: from relmlac3.idc.renesas.com (relmlac3.idc.renesas.com [10.200.69.23]) by relmlir1.idc.renesas.com (Postfix) with ESMTP id 25CFD51794; Mon, 8 Aug 2016 18:27:01 +0900 (JST) Received: by relmlac3.idc.renesas.com (Postfix, from userid 0) id 19E1C1806F; Mon, 8 Aug 2016 18:27:01 +0900 (JST) Received: from relmlac3.idc.renesas.com (localhost [127.0.0.1]) by relmlac3.idc.renesas.com (Postfix) with ESMTP id 060F81800A; Mon, 8 Aug 2016 18:27:01 +0900 (JST) Received: from relmlii1.idc.renesas.com [10.200.68.65] by relmlac3.idc.renesas.com with ESMTP id UAA27589; Mon, 8 Aug 2016 18:27:01 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'208";a="216937994" Received: from mail-sg2apc01lp0243.outbound.protection.outlook.com (HELO APC01-SG2-obe.outbound.protection.outlook.com) ([65.55.88.243]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA; 08 Aug 2016 18:26:59 +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=swsdEctXuMuPjnv7LhcIz+0HORybuLGuJ0gbumUYIho=; b=dhrVGUCWYG3dVRC8uILzn0gekCMD7XG7W1gbUaah527uYi3KbzylYw0ShRp3gQYT556jt7NLAC4Y9vpo9ml9mL/adyokDmLVO5pr7KqBjwV4EEePaFfEVTOl2OHSjN8lPgR1GJhBJCIQTDuzMhFzpDnMFrChYNUWrFhtXp+51Sw= 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 HK2PR0601MB1441.apcprd06.prod.outlook.com (10.165.182.147) 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:26:56 +0000 Message-ID: <87twev1uux.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 127/159] ASoC: codec duplicated callback function goes to component on twl6040 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:26:56 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: TY1PR01CA0026.jpnprd01.prod.outlook.com (10.164.162.136) To HK2PR0601MB1441.apcprd06.prod.outlook.com (10.165.182.147) X-MS-Office365-Filtering-Correlation-Id: eead904b-7ebe-4814-6861-08d3bf6e248b X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1441; 2:kU/bch8oOaUZZbwEuHNKDIXXADB+9+HI0bQMZgBQt5aJNxrmGOTYlS/gwWnAgcjVD9bkM9ZMyaQx3RCZVlbUGzuk2yuwUNfz6ptsuyfFZfR5ONqnpDc/xoKQKrqrW/On3Pp5ZQOg4kvML8Nr/4kLC9tPGq+CxPzJZJAA0bksyHW3SDVzcNvXz4tPvfHwFpak; 3:2t5T7WUBbJag1AwG94NV5cneG1qtbAelKYwAlw8yxPj33v53JyGu4nFlGGzCyJNLu2eHX0WOwhL/O3DqahHvHzajrF7Pe/QgPo9bUEtDI9pn+yUfEmxg5BAFqCKRdUo3 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:HK2PR0601MB1441; X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1441; 25:PTg5FY7s/25Xzv+ygz2hKgpt/LEtCqGrJma01XgGWP17vbUqFUgiRjPW2kCKtkknrkm6ee1T1fpmqtmb5iEjde92HlBB/117cftaTSDMb6EB10ukpd4nuEuNXRCXcXPxpPpRz3AkFjXUV+kRbedWtTMjGdFFODwnbrMVwfRl+xOVqpC6uQOrPbBsKx4D9ZHVLRcYbbaJ1PuQk1d34EePihccEFAHx298+48h/mceQnelSUGp7pgxoE7D02NTGxTQCjvoCIuUXMUXXGubX1at2OQlSFADnG21P4Tr2SxQRlyHPG08rxo428nxAVm7GFnUhk8895aj/m1DZNNmOsfcMY5sqWw5qW+vITP9B5ZP+Q833HpE1ydngm5P8EI3jZnBTURqtYqxOuirsxaf51g/+ZSUNwwMVNA5gZeT/cotlaj2sn4NVcExN95RlW5eyexrpzh8tUIWmN4R9MHn1WKnI5SVnUW9cjL8UL0MU/M2m4LubqvMZwNi5Kk1hKd9kx68JUww/HTc2ezaJzb/Oav5aCg8jxGyO0t0MEqqjtvVw+TUKLMBtRQj2qtlIExsLHG9ChcOF+FDYSY0SjlfwZhJBe9zAZnuQdwPC2OBJpfZ7at7tXSF8iGMnwFbTwiBA2I5fVgVvDm/FoAPVySdtbtFpCCYF+0ANzIRhNkHkGFQdSkYaQrP4NQzOGHs3g083Oeqwe3zdlm9/N+Y9EtmZ4j/ixJmpyx26zDmwl9nYhjDg7M= X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1441; 31:umQh1v5FSUgifxqzGwN0zdFjJP38P1V9OwoC6oRkATsFa2SvG6c97Vre+KDE6nbd0GolLIUUjLDdco7YBSoFBQPZHAlHz71VXY8vS2Hkfn6M8NBCDjmbIlL66tTmMfUCZGjhOSumrNyeBYCb6treWkjpDgPGVrbZ//F5xWepD3rckG6XoCLiJ6oNQ1QXgQ1v8Hm9+/mZRnEDN3ubUJifW+nc+/+KKn1TWm3OYfwiLGE=; 20:i7kQoV/+gcejeeRHtgfanfkRjPD/1rhIZg7fqDLHG4KD461WVxF5i4kOm6NQA/4wljNjNIgMPd+/l5wJ+GKn9EdniAFsHDtEH8/TOkx9HuTJCXC0iShLxrh0yQfNhF7F2r0uwfYB854q983fpqqpWIq+SkuHDzdco4Rz3j8IF9L2kOwKRmrKrCN0YRAdDAQTv6eHOAZR4HE7SoiRQbJNmTrxiK5wFR90l9ae1J5CCjfVsqKeFFXzn6f/WxN+VRR5pFqpSWaC071EtG+wc5KZMSXea6Y/y9o0D5XyE3nK1JfU0whyIKFquED/wSFR/FAx0jYsHonpdaaRxUNUiQpw7gn6AtKBuFby+jNVaB+1OnS6ngmmUn63pE9BGTcyUtizeKmgmqHIS5wrKqC04IRv6tTjnA1BpM0nUzRaGBkwqPWTMyQE+Vgea617n1AL8LmC3U1LpIdTsxw2eqAnSXeV6OnNJhL1RuWiyCmICxq/Xg0glSjAWFT9GukilTDgHuPm 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:HK2PR0601MB1441; BCL:0; PCL:0; RULEID:; SRVR:HK2PR0601MB1441; X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1441; 4:1GfWnbHRXAsofkzLuTtlF+YBThejAf1YzPsV3YmjIhXT78jaOIGRRcPsmcC5eDn2666/SUYUnbSk1PzSeUZLWOXCdnYcamWNNGgKXfDI7FOsZ4TpY8WRjPEblPcCI5kScuuQaORIGN6ZmGCF65nJre3z4igRwgjGcmooLtX+hplH3Ag1/Npvz38E0kJofxzZdfzoJ2D2e4lxc659ImxZs1LWGahax/TjZT+s3uHlvWyNjhE4hmj9SlIFK1metbbFe09c6Pr2YgCsnti3Ym+88uwOVDzM+i99obtYyGzcdIYI7MK6/aLWbK4XoXUbK44tqadLKAtI4IGvoBsApEuKho469BR6xVBHr4ojG+qAH0tsvXgjX2UaK4azstwCAPqpVuoVCz53M8U6bgRtR4bo0g== X-Forefront-PRVS: 00286C0CA6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(189002)(199003)(189998001)(54356999)(50986999)(105586002)(76176999)(50466002)(42186005)(7846002)(305945005)(4001350100001)(229853001)(97736004)(53416004)(110136002)(8676002)(83506001)(2950100001)(106356001)(77096005)(7736002)(66066001)(81166006)(19580405001)(81156014)(19580395003)(47776003)(69596002)(92566002)(586003)(86362001)(68736007)(2906002)(46406003)(33646002)(4326007)(101416001)(3846002)(36756003)(23726003)(6116002)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:HK2PR0601MB1441; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; HK2PR0601MB1441; 23:eTF3Ic0efDiH6FG1Y/5n5j1FcMffujK1bFcuZrh?= =?us-ascii?Q?Zi1UfAqrcq/+FeNvO+G85EV+dr1+auVJLPO8Zv56PbfgJjxiN78djo8BEym4?= =?us-ascii?Q?fzAyWVPwbe2geMpA5PDNC3FTMPE2k7Wh4wm5KtkSZ6Wg2hf4FtaViDcQx5hq?= =?us-ascii?Q?9lJMpLruBNCy+xsajkUe2HYa3LPCRhXlKbohIPp3+5wQKO9ikZAbpVlb9glA?= =?us-ascii?Q?3byCSLCW4wwiUNLzizS8K4ALOTee7QOoYD4q80nR5t0r70QoB8kqWzpuk2nj?= =?us-ascii?Q?1YypPpTuSJum2HDmRRFN0OQx0Px0WlOBQ0EL/6P3ZPbGbBO3cL8b1Lpi3qr9?= =?us-ascii?Q?y+ZU9pj0Pvpgogwt5fROdpbHPSHpQW6xzozSNcad+C6Ng3FloYFdPFQG4G3f?= =?us-ascii?Q?4wxXSGzuYPZqrEiUs/wTC8AL3iXRtVYU/Sm3dTiGd+hWZaO80LgLRa4fSWHa?= =?us-ascii?Q?iV8lsy2NVlgIrJKbCQRwP1y2u6bwwWLeFONSw5qeP58w5VTAEa+/sRb2AHGB?= =?us-ascii?Q?gsrFfkf49eX8gCtfb6kOvDF7ZrPCzbiNQKrv2oR5pIuNTEaku3zavqnCa6vi?= =?us-ascii?Q?dSYUTgzhG//bsnxw7p/5mxmDJn9kYdWIq02rGPHaFWv3sYA4BqvCfQRinaaR?= =?us-ascii?Q?3GYRCbOxguvWCJxctm8OzaAY7FXur/D4GSlrQ1fU2V6dNWy95IqRLTi8AwgE?= =?us-ascii?Q?cJ70kbzVx4lspWY0oeJLDtSVHLVOiOPJ+lWGYtqxIF5uPmLQo1m6oAhkVveQ?= =?us-ascii?Q?YcPGo8St6k4M/iLgnkWC/GWBukaTUef8Z5l0t96Z5WOs7y9WWQkh06n2K9qW?= =?us-ascii?Q?Sw9Enf11tF7/MYevQBGN3jGSJIszp+/GLYFvGqxwsbKZAfLPp8xCE0yHvSR4?= =?us-ascii?Q?tPSuvNklVP8V1oAKUxP9+mKksmh0Ln89FWb/jZwGuzMyH0BN/mTbPKcCPIRG?= =?us-ascii?Q?rE/m3vwYH/OoeptkO9evWQEcpHsq7JZ2N/Mif+FIYMv4OueB+yR+8XU6iTly?= =?us-ascii?Q?NLPNvaU1Pp/Ip7A3JuPWtoWkqyM0cvvRnu62Gq5KvzI32T/4gxsinzCZm39F?= =?us-ascii?Q?72uACnokeOEDJbS9MYYSGGRm90jTyQ56PCV5gZoLAUII9HcpbrVNVqoF+Iv1?= =?us-ascii?Q?xy5LAx6WOXHZoN/czFbqpQY7gzpVbXfSqapwebz22Yc8LhXr+9ijk4A=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1441; 6:LrMe0muPvUMSbKCGetumY+y/nOFWuWikzWsbrQySG+4iXJb6LMp0g5AnU7NXHc3xTH57qWkQ1IVrJKSIn9Lz2kdkxS48Fc3YZxV2806eY+bBR3yp6AgKIKQyq3UQm37mgf59o0KamFSFXdEKtIcKuiitRHdaUrx0j07oDtCNrbEHszNh2PDZeXQlRTWg3fMcAGqMzPtEbKSXct1CG7L5VbKIj/kiMdxuZ/r1fHW461EwHWXHma4+JBtMx6iKtQLGGqy7iBGflBA0NW42A4sU6lX51m6djXjb5DtFhlhwlroSjB2gMRgj978doyrbKIEz/OkxMVAdHPhAeVu/iTFCzQ==; 5:4AZoYbEn9Cuosvvd5+GuDS+rT5D2sfdO/I6JSaS2bWe+DHTU3j6Mp1banIoHNKKE98PS4MIbRq1YmgjOXioFHcaxy8wvpG7dLnEM3Zixk42WxRQSjK0KbrhPsf4BjRf6txV7tGANo30bBeCTMDQ83g==; 24:4unWYl3zUBWxHz1Y1KPEQ+jlh02T5yG273yIdMzsTIE0jkfnWUYyD0w9F/YbFBvvcfCbWkS3CYsls3nkrd5W79oDA4PML/hyf9pu+C7x2Ow=; 7:tq4gMMLAIntaIrbmxMz6r7YFlxzQirHjmkvglIaUaoufEjCqt5Kse/nlzNMdowJoY4EBDbh998hG6rxfKkfpRWhajLQY+NMPUW+GGlVhFXxjAc/SB6TIFoK8qLlO9ReGpHOrZUlrNKpB08efvrRj9fpnFvalg4lxzc9/O+vvNwqrSSPCbrJ2yHU/VFUS4Q4VhrQUolDf8yi0hk+php7ySIPxdxiRjh7J4xYIqLel/Df31gOqdhdMnhRuFLjikytg SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1441; 20:Dq14n4ZWGbwy1MBnM7yZhtG/HMBf+lM/IP316omqHdkvHKMsdvW/rwAxR+JX3mVVh2gbd8E9XLi+bElcGL+D1sUwVjZ6EUKL6bOXo4ti4GqXOLVzq+OkzDiouzA62kUK0Rd7UtsmQ/+cbIphB2EUPYYwYGpsId8v/QmrCejkimk= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2016 09:26:56.5642 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: HK2PR0601MB1441 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/twl6040.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/twl6040.c b/sound/soc/codecs/twl6040.c index 1f70810..748036e 100644 --- a/sound/soc/codecs/twl6040.c +++ b/sound/soc/codecs/twl6040.c @@ -1156,12 +1156,14 @@ static struct snd_soc_codec_driver soc_codec_dev_twl6040 = { .suspend_bias_off = true, .ignore_pmdown_time = true, - .controls = twl6040_snd_controls, - .num_controls = ARRAY_SIZE(twl6040_snd_controls), - .dapm_widgets = twl6040_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(twl6040_dapm_widgets), - .dapm_routes = intercon, - .num_dapm_routes = ARRAY_SIZE(intercon), + .component_driver = { + .controls = twl6040_snd_controls, + .num_controls = ARRAY_SIZE(twl6040_snd_controls), + .dapm_widgets = twl6040_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(twl6040_dapm_widgets), + .dapm_routes = intercon, + .num_dapm_routes = ARRAY_SIZE(intercon), + }, }; static int twl6040_codec_probe(struct platform_device *pdev)