From patchwork Mon Aug 8 09:30:34 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9268169 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 E81DE60754 for ; Mon, 8 Aug 2016 11:21:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D7B5627D5D for ; Mon, 8 Aug 2016 11:21:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CBC6A27F8F; Mon, 8 Aug 2016 11:21:49 +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 DE94B27D5D for ; Mon, 8 Aug 2016 11:21:48 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 097AF2671B3; Mon, 8 Aug 2016 13:21:47 +0200 (CEST) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 6382E2671B3; Mon, 8 Aug 2016 12:06:26 +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 BC0D1267A98; Mon, 8 Aug 2016 12:06:24 +0200 (CEST) Received: from relmlie4.idc.renesas.com (relmlor1.renesas.com [210.160.252.171]) by alsa0.perex.cz (Postfix) with ESMTP id AD80A2671B3 for ; Mon, 8 Aug 2016 11:30:38 +0200 (CEST) Received: from unknown (HELO relmlir4.idc.renesas.com) ([10.200.68.154]) by relmlie4.idc.renesas.com with ESMTP; 08 Aug 2016 18:30:37 +0900 Received: from relmlac4.idc.renesas.com (relmlac4.idc.renesas.com [10.200.69.24]) by relmlir4.idc.renesas.com (Postfix) with ESMTP id 6EBD059D05; Mon, 8 Aug 2016 18:30:37 +0900 (JST) Received: by relmlac4.idc.renesas.com (Postfix, from userid 0) id 600CB480A4; Mon, 8 Aug 2016 18:30:37 +0900 (JST) Received: from relmlac4.idc.renesas.com (localhost [127.0.0.1]) by relmlac4.idc.renesas.com (Postfix) with ESMTP id 5A6F548014; Mon, 8 Aug 2016 18:30:37 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac4.idc.renesas.com with ESMTP id UAF17758; Mon, 8 Aug 2016 18:30:37 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'";a="217448272" Received: from mail-pu1apc01lp0017.outbound.protection.outlook.com (HELO APC01-PU1-obe.outbound.protection.outlook.com) ([65.55.88.17]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA; 08 Aug 2016 18:30:36 +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=wGvgmuD7/qN2k+PGfQmfltNJ3G23zxAbraXbOkSfehw=; b=XfanThJ5dCd+nGqWZXAlzzhH1Ogsoaoxc8Amco9Tfzty9ewBEKsZyrZmtnatxzKZ0KxOnixDjTJPcYbk1WBTqJpFsr0TTJCV/YqJ2+121AmBajJjW6Toqex8Uxh2O/L5YLRrGgPs+qKNYtHo9H9JU9VXaJ5TIyFLpP+LqBly4uc= 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:30:34 +0000 Message-ID: <87d1lj1uov.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 09:30:34 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: TY1PR01CA0102.jpnprd01.prod.outlook.com (10.167.154.20) To SG2PR0601MB1456.apcprd06.prod.outlook.com (10.169.106.22) X-MS-Office365-Filtering-Correlation-Id: 96526a8f-6381-4009-98ae-08d3bf6ea63e X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1456; 2:Dhm1dqmcOKjXFjwF9R9ojqVfrgYGtE1A/qvxc/AhmVgbnZxxuubDqA3qj6jQyMYXZ2ICKQQbCKe3aGTrYabsv+ZhvNwJ6WFm8VdsxA1KsCQTXxXM45OELKtihCc9H9R9+ETibRkZ/NK86FhbfQshe4GXInatg6LUxia+1ufC9nGtzt56qrpcjziEi2ASEtKu; 3:o+THc7vZqfEjoowpIgjNq/dsPq26aEChpyL19sWdBjHZ+87gVGcQjb5sBxQBjOESKZbmfX7pGpGwS5c210XdmBNr9TJQfeDi+DdMnV1ErDcsOHdp7XfJS8rq3xG8da3t X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SG2PR0601MB1456; X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1456; 25:78dHnv9RLFsF2V1FmjDrzrqFQ+9sWHcxgMdj/ClQXqDC6E8f94S1RgOSEoHwU/cvShl2WvVOf1F4/+39GPLYTmMc9M+JwcnaBM9geMjoErmurpsa7de2e1XMzu4RO0boZ0Vhh+ZyONFjBe6YJa4CD1f+AugED17tWCFaqfndOEtXTIeTHszxnQ3cAGcBar6+7RlcUBrhIq4Auvcdxq1/L7eG1uT4fDHXv21UruBTdMe7euM1NmDhEBgP4RA3EJwl46BjkUuFO37IYPlvFRWsZJZgXVAo17e2XCiWl9lFfW7JsTTkprBe8bBLwFfujNYMx8meo35moqI+3J6Cr6kGM0BJRTthOEJGcr5luxLq2iQzToCgNBQBuhxl2epyGDI87iTBLjn3v83xWqDPmq6p+IncwsSZipfz4hR5069w2hdmIMh1Kxt4jiwFuuZ+B85VJSwreAtkhQv1BhCAv55cB2yhSwPvrwDjxWHzx1fH5Z32HsoVi/c/C5lmPuk+sKqtraY04BK5MrdXXZHrVMrTNn3NEPHcrpEZLpGLSdvm4O/qvB4ahIQUDk5P+9PPE0MxeaOMBMvRLZQq4Ca0QBJ6r8I2N5HzeSuhEartp11o7Rchlx1A0TgAkv+PrZ95Er8T1+tXQWTKgpSGAUM8ldsUDVA0PPGX61/IpVXPlk+bECjc+04G/M11JcGAUhR5cdlWOt+5PskPDBuYkt7NGsVAYg==; 31:nk2g3zhsMO5+6PZSsW8dusuoycsNUaxtRsvd4TPNTPDNMd/aNd2Lt9iTN8cKPZt8WUAjRuiOLl9/qKoIXgOJwdI8MTKEt3h4UyXjigmyno6iiNMoiBQTRTd3I00U5g+McEhUUL+T09+abNC1EGGT2w8zhyWRbzgl5sSEZ0wf9IPwW8Ml1k9vlpw+t7pEKf+f+ivK/b1v2RuZAWZDwr2YtjskV8TFvtbe4pbCBcMju5E= X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1456; 20:XUu3P4bSjXv81j2VieNaDwGpLuFvnA5u7RVT4NyvBvfuAR0ESrqIBI4znaHiOVxyDDOKteh95152tF4Gus4JOgtCPnMPdc/JxgVZMOJ8d0nd/C1jQ5Ft7qrjb85XEXW6l5Ko/MOIUETZ1knqBU3ndEtsbXslzL6FmjrT1y2I3w2dsS/KRJsFSmZjV06DiMDDZXX3I+S8YrvpMLPCGMMRiRVrgvc0vFhAACI1l0qjALOi4IRiOxDkVit18tlpNEo7xUHNL+I1/YhmimUWQEqA3gOSYmIHM/lryaXhWWABu9FeqtEWzteI1wSaUvzNY4U0Hq4pIymxHIpxHu2X6HvfwSwfvMN/uvhzbNu6ARvwWmBrgY6o2pO1ZCClF9DLgCkOf/TYOuEmhRaWWLxmOit1lF0vhXEzIGZX3KpEAOSKG4NWgTQmeh03QeFVvAUGO1lHH7UFfigVoW5PIRvrk+HyzmkwPQKWPFxisc/NT3dPhImm+Iw5Kk2Jo46btU1Sof75; 4:c2vamB7wu/EROrGIXijvwelnGGB/UU4qJvY84IJ7Pa4Qk7CT2Ed2UAkNpI5r5PqZLV5+OWn29eRe92Xo314e6BuM0ofzChZwPAkH+WNDr6Y2HsZEM5pkuqkidudvI0sHapHrqUfbhca2kwFf3Gk5iRQb6uMthFofj63KG80XhTItuFcFRvvGcaFzud8vhLh6HM7L0Lj+eMkSYv1sUy0WGrR6fY6PRvNql7pLC4WogMR6YOEcmKDAIgznxNa2N0eQErreGu8XsiPaQCcbeV0+h8ZTL4mfvKGZUah2DAwOBfoGqJJqbwLQUcetWP2bp6ItycTMK0Ht0u9Hxymph8/6idQCI8LHPKA+oM12om2FCLhdA1jwpvu4u2+eir9ewby3aS6zwZ03v9tE1qxlAmNceQ== 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-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:7hdIYOXfFcW7V0tEXxx/8arDwv1u0LgGlc8kvML?= =?us-ascii?Q?IL9PCFLPbFiv0YdqY4Z/Y+aVlZGmA69V9ogPpq3EWxT39TXjskjPHaJVa0zs?= =?us-ascii?Q?+0uWLDdy3owRVuCTL9pPHg67RJ6UhrC1vC0toxx0ZfCeC4Z4CXHGmmelhVPu?= =?us-ascii?Q?d2LRZEHb4pXR20kgyqVWIUO8O2ZsiiuAad1t1Er7R7ATed1CDU9LMlIX1HuI?= =?us-ascii?Q?zi4qNJG/i2Ia+cdg3py0jhlr+GjBAXYGWwFQ07gzQtvnaWODahI//55NDywu?= =?us-ascii?Q?DJra8hx374mVKIkR8VsMtOhz0yyznV/1eC0K7IW+TuVXWWgjAlLuJfmgw4WG?= =?us-ascii?Q?RvYYAuP/GtufuVlNmM3/ep6tiNv8or/FzOSbT7JgMzwyiW93TEjFBUFFUQHl?= =?us-ascii?Q?wo1Bsf0nHrl6cldat9VzqYew3LwJjRVnV7mvgcUzuFwqKie0ONew0ppDxIUJ?= =?us-ascii?Q?khfy9gHZvbtVZ2A0bXLbPI/R5Ijz/He4ZGvh6ABLYOTOJITYqSbDGOXE49cY?= =?us-ascii?Q?kpUZyEEnT/zIlXPGwPCOaAGvs03j/9D/Ag8gQwPD7XsSWM35FpnYnfOfwswC?= =?us-ascii?Q?XXIhJHxyzBJFomUF6MB/CI8jD3VvwFJwMBpTdo7uoC8wGR2pTxlHDUNKMAn8?= =?us-ascii?Q?BrbK27dpI8zVkh2ZQHQCZUw/NtXmKiiq0yXH+LkFhYh35/v2uX5V1lDjiyq4?= =?us-ascii?Q?dh+xplnT82SPECW6BNnOolUVow+B7X32rgQKyDDZlZOkUV+1NFhcJ2j8ZbT2?= =?us-ascii?Q?2xrJxiCCM0w9CxOgmEI9kQpXbGBEDO95l8onx8OBSgrbTZhLaFvBw4EJnvKv?= =?us-ascii?Q?ZWU1tXzN3SoMQI/9pPh0RSy57RJaohqtvJc+ltcVXpatGMAu/prk+VhPNE9Q?= =?us-ascii?Q?Xyb0E9rRor/6zXA1l3AXCas2qw2/EbLRXqaixucpcSIKH5OoQXOSs/n1pnI1?= =?us-ascii?Q?ey+ubPkEs7DIRzOKLzZ4VgN6fzuXDmIevp8Ncuveqw6AfK1y2Ylml+YX+XYt?= =?us-ascii?Q?Ne85wUdUPSS1oFcHHwJ03RWTLYqn7gz0dghPpTHci+OhU9fg94yhcPXSNfTO?= =?us-ascii?Q?K0QIkmy5g3puVMSlqDvR6jzBp2iZt52IOEgQD1S+YjVoT/htdB+MRKwttheG?= =?us-ascii?Q?MqPU2Zwm6Thvs1HxiPv2Xv9wJlQxCUXmX90fGmlIfrdYFeuJLI8ea2w=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1456; 6:Rfk+OpXWstGntaZzJhV90l+jpgoZTPockJ924J2HeM+dvUgBAdpM3S4+Hrmraa/qBHJS2/D0V6TUYIpZ91Lr0i7TFt2doVwQarNb8h/b8da9DXiXokAFwSIuEXi5D8tP5FQRHzFXseSb2MIs97+E/CeJmCmRqC3V1fpU15jl2aoSDi8Jwkzj/awFz87LTIYzOjJ8nRlHeChZI8vsFvEJimGMNH9trLi5uPdqXWFoOKgspMOkHZuIskctPQkZkTo6O7hTQ5Eoey3aipoHKutH2IYGEEYiVZG70gzgk8kYyEjGGyRJbLDWgrwIcIRoZ29PK0E1SaJ6wmezyvVKioRegg==; 5:JbxRt6WvNJa4s2hBCxd6GYu1e7ojGD39L7qp10Pl1kkOfZE9qpVr5grYmdNbxrg/eoGzL2Tm+Je/NPnsQiQBZVKzg8XzF9BreBqqFj4035pssfr9QGD/3ie1io7BO/1rawXK1gTyk7ySyiAsEQ30RA==; 24:OHWzbAjGeJ4utommCymDzvaRk+eGAjPjhcmbWUoYDoHEnoNSRU/rLZguRVycRWRRbtxPQT+DF9FjWG7tbdb/twO7SZV+38mTLA7lq880dlc=; 7:tbCuHP2TYs6DH5ZPn8t7E/rM29bzD+J8ztGEFk2eLwOcvdPQC1WVb/fFvbv3SR7mSTl84HvqDW8RqKIIxPXTmryMZzR80tiJIqevopDD3C4Hmx3ImFP5m4h2JmEkjaq3MmA4Zte9PlHqManpGobUV8uCNewVCae2WMrP7qUTjZvGj9a7p+tXTCyOEjM3khS74lJNfzGykZ28gI+/4qs7OOnzBZeDdM4sG4kyDruNLeeSKoOeyrBMIIbOq0xRLsJ1 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1456; 20:Xlff7s+Alg2ES4d6Sx9xhUrmBjXNM8sXR8dZidAJPmgNASnwj8qAGhFeanOb5BFV0f+84LdIvVdi8wv3ibbIcO/XZX923ZNKjUqTjLxldUnUYwCFgB2WGsv/f77VJ4LtohHYMn9ha559iu3R6XFVYqN9n1doWG2bOsJrVglWRv0= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2016 09:30:34.0355 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: SG2PR0601MB1456 Cc: linux-renesas-soc@vger.kernel.org, Linux-ALSA , Simon , Liam Girdwood Subject: [alsa-devel] [PATCH 139/159] ASoC: codec duplicated callback function goes to component on wm8400 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/wm8400.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/wm8400.c b/sound/soc/codecs/wm8400.c index b1d346a..4551e54 100644 --- a/sound/soc/codecs/wm8400.c +++ b/sound/soc/codecs/wm8400.c @@ -1339,12 +1339,14 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8400 = { .set_bias_level = wm8400_set_bias_level, .suspend_bias_off = true, - .controls = wm8400_snd_controls, - .num_controls = ARRAY_SIZE(wm8400_snd_controls), - .dapm_widgets = wm8400_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(wm8400_dapm_widgets), - .dapm_routes = wm8400_dapm_routes, - .num_dapm_routes = ARRAY_SIZE(wm8400_dapm_routes), + .component_driver = { + .controls = wm8400_snd_controls, + .num_controls = ARRAY_SIZE(wm8400_snd_controls), + .dapm_widgets = wm8400_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(wm8400_dapm_widgets), + .dapm_routes = wm8400_dapm_routes, + .num_dapm_routes = ARRAY_SIZE(wm8400_dapm_routes), + }, }; static int wm8400_probe(struct platform_device *pdev)