From patchwork Mon Aug 8 09:32:37 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9267497 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 6D648607D6 for ; Mon, 8 Aug 2016 09:32:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5CF2625223 for ; Mon, 8 Aug 2016 09:32:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 51B8E26D17; Mon, 8 Aug 2016 09:32:44 +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 DD7F825223 for ; Mon, 8 Aug 2016 09:32:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751158AbcHHJcn (ORCPT ); Mon, 8 Aug 2016 05:32:43 -0400 Received: from relmlor3.renesas.com ([210.160.252.173]:36723 "EHLO relmlie2.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752134AbcHHJcm (ORCPT ); Mon, 8 Aug 2016 05:32:42 -0400 Received: from unknown (HELO relmlir4.idc.renesas.com) ([10.200.68.154]) by relmlie2.idc.renesas.com with ESMTP; 08 Aug 2016 18:32:40 +0900 Received: from relmlac2.idc.renesas.com (relmlac2.idc.renesas.com [10.200.69.22]) by relmlir4.idc.renesas.com (Postfix) with ESMTP id 8E74D59DC9; Mon, 8 Aug 2016 18:32:40 +0900 (JST) Received: by relmlac2.idc.renesas.com (Postfix, from userid 0) id 7C8312806E; Mon, 8 Aug 2016 18:32:40 +0900 (JST) Received: from relmlac2.idc.renesas.com (localhost [127.0.0.1]) by relmlac2.idc.renesas.com (Postfix) with ESMTP id 778502806D; Mon, 8 Aug 2016 18:32:40 +0900 (JST) Received: from relmlii1.idc.renesas.com [10.200.68.65] by relmlac2.idc.renesas.com with ESMTP id UAN21460; Mon, 8 Aug 2016 18:32:40 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'";a="216938470" 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:32:39 +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=5rma+ZHScZsCxEyN3iq6Bha4Gmhu9jGNKoPd/+OLr/U=; b=VkF2W3bE86BTrhAmkVRFxzD/bbL5xOlm/EfXFMayxV/mraoQgY/SwwKYyVZ+mYp6cZN0ogE+eYsNFTPWqI7e1M2MRM3O+f6bworQhIYlG4g7/VNJgA3q7g68RovoNhm/McjmGnTKwY2RXPMEJaF9l0qScyaODOzwrOc0tPSEgNQ= 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 SG2PR0601MB1453.apcprd06.prod.outlook.com (10.169.106.19) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.549.15; Mon, 8 Aug 2016 09:32:37 +0000 Message-ID: <8737mf1ulf.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 146/159] ASoC: codec duplicated callback function goes to component on wm8971 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:32:37 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: TY1PR0201CA0006.apcprd02.prod.outlook.com (10.164.90.144) To SG2PR0601MB1453.apcprd06.prod.outlook.com (10.169.106.19) X-MS-Office365-Filtering-Correlation-Id: 69c7d199-42d8-4cf2-c954-08d3bf6eefa8 X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1453; 2:Agzi1ECM9BYdctyEn4nZ0a5kDKsFrAzErplFIAlNpBdIh9JNVVGpzCU5HsuAxMgdhxufiu4w19T2jNVzShYci1TS9O7FVmONPoL1TyzPvCMLg/cI2SdtoJYRvMx35rsG52pqg5PQKqjA5GVdZ5CIpX9JIWaFjrdg127sBxAp6PW17TkD7eU7ybbHvUWaaGSu; 3:VVOXzQrlEGwQSGTl0BCnWWwf2fU+RXpfXxrZxkm7lecxp6uvS6X8in0IAhalLtT5Z4Ff1ODAOitO2Tun4zQb3Erjpn2BdVAZlctYedu7fwFfl1LlMKpAwmMFxBgqy/B3 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SG2PR0601MB1453; X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1453; 25:KZHvL8qx98O72t2CcanZpDvK3iEers3jByqk62AIF/3lIvt0WN3MowRRqNNuFp0UgT28zZEwciih/BJgLuTXXSAJwudyeoXjP+kql3OVpQUtUqyzfEiU/yJVLT0R56YNf2mfm1DUrw2nDcxlwsnBRb/k+D+xPkYaTT8XFFeBBYfz8Dlac2dV2y6EJt26dY4lvEdvB40KGmeg+DQCofatbmj4RhYiPi+08IQVWqOADUWIN+ZOBMP3B+t1vI9tNNAa4/vBKgvQaRWkDnS0SeYbnZmE6dJfN75h0Kl2CPCV7FUakWIPCzLHoqWJtk3qp2HcGKW7gTeChMK1485obIsnLWC5I6ESbkT7A/t3RymdHUmtoxvNgIumV8Vik+6AP1B/o2OYhbEHhJc9VKUbasBUdRAddMYROileX7kJFD9ZEeb2Por0ELUjv7RJ8pzxULMWaRSaMTsGoNQvOIrxGvdmi2JEEEp1JEOnSrn8JloayiERqrA92F3kJfeHIiqhInYLFcvBl7ErOmeaEEEmIYkSiT5/TrcbjJRMe3UDPRNKrUoqQ6m39IwyKRd7JyKW84jSFo8aLjrnp3AIR6Ga0bMiWpOAyFAR+QTYKp62sfkLiGgiQEQUjloLoXTU+Hu+crNud5sXUoI1w/2Ltjkm11zH/mGWnV5GtbNfUlKADao713h2wGk8N1TgfsTQLvwo3tuKI+DFPE0N4rGmTQ8vEWkPyg==; 31:bG7gmA8rQcB7aceKHtD7DR8/Ul8YYD665fib0tN/gOMdwuLjgqYjI4m6C3Gp7sKAHP8UduKRBQzm6PvpNTEuOrkznWB/7ngvWHApefHh08NVIWfsU1U1K+6WrzPwB8/XAprFuy6Ad0m0XTWrL/mm452xbqNLvu3pkQba3IEv8YFOUl/lFwhBy17zwpg1438Z60GeVQfZW1n 5dDQzKeAsGJ8fAYOOqOg1bWztJXx1Hg4= X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1453; 20:inKIr58/V7bQZ3tcwIRfX1+2iZRS+K8Fx1AQQ+2oWxGod/iwm9mISlKfrz7MPlVfXLFHKS5MbdG0pBmw+s4Wv20wHFs0MXtsUFcjK5pccDU29ATtKkoTj2J9NYBmcB6JF4kNg3oZ5VqOhIJiikwF97zULsqTv881WsTQx+EO1wjVg/hY7CLCKX3R8ie3GmI+tWKcYjB7Yd8OwG4x++Pz8kZur3fOySb8CR6AkjAWZAeOLpX6RLjW6IPDkk1igT93Y1v5baLG/Ak+6EB3AjFwbnF3bJa44PY8SPFniQ2Re59qGSD+2ASAeP1VIITeoyLTe4aozaDNfALZJNp2BYMmh+oQrDBu/6XuL+AbSeWMRtMAD2mJLxKnrp/saJS8Izfgu3n5dQjlzo5Gg0kijn0peEQRI6EKPwnJjoaD6wZrqV1rDoP8TIpmThwXu+XEXu63GKmiacVpDbxqCoL8eaKlzi8rlEpdBQ6WRaiBFz5Wpc7kvWmSpyFulcOSnUFwUfWG; 4:OxvA9v9JlK2p9hbAQSXrG/OA9az3+E5TJ7i8efp/LQii2nMEieQ9fkNiDw3GBBo1hA/ViCwKsTUmNz0cRdoqZTLpgBB5CkqTXiKw+BNvdqiGxtNeGYZRFDpPMj2MP0NLOajpdGdSn7P8U8yRO0vsyXCFe8P1Nut8m9d8WbJ1HwBWxRjp2SuIS/dfO6nrtFqlUyiIbG63CJ90S76PqZlxBk7jiUQDz5BhWY2xkLlevwovuqxm5PHVXfWmqKuknsaUEQF9cpfXkrplPJXFbXQd7mOaFVO4s2W+8KGN/RR/cZPPJYiNGO/0rGktn0VKR8on+Jswt1tyqLB5gH0oXz2F9iq+BBOO4vklwQMQ7Jw3++gpfwVR0GMnacGK11g7DjZEfMW5cngyg3T3BR6EQN7TWg== 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:SG2PR0601MB1453; BCL:0; PCL:0; RULEID:; SRVR:SG2PR0601MB1453; X-Forefront-PRVS: 00286C0CA6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(199003)(189002)(586003)(105586002)(86362001)(7846002)(2950100001)(68736007)(47776003)(97736004)(305945005)(4001350100001)(7736002)(66066001)(36756003)(110136002)(3846002)(92566002)(189998001)(76176999)(54356999)(50986999)(53416004)(8676002)(33646002)(46406003)(69596002)(101416001)(50466002)(19580405001)(83506001)(19580395003)(81156014)(81166006)(23726003)(77096005)(4326007)(42186005)(106356001)(229853001)(6116002)(2906002)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:SG2PR0601MB1453; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SG2PR0601MB1453; 23:v15NEgd8BpZ97R+UH/uffZYeUiYDjJChWzlhUQG?= =?us-ascii?Q?fWe+LkcEMTYz+FVR4U2GYEJfExBTHNde85FKHjfp9tRIZOzX51iFJ2/OqtWV?= =?us-ascii?Q?aTV9FSMqfDvJtWerNPFXOGI+X4aEXbAd8R1iP4i1XJX49vt0gre9/R0blQkp?= =?us-ascii?Q?ifoe5D9cWR8Zmm/bPMS1xUWawwwk6zfRxz2BikTq9vv9o3vRVpP08FuFRJjC?= =?us-ascii?Q?atymsL9DQm/KWOZ6AOLNE+NgiQKktNFJaA4dRA48KSlnJALJjTpCFRDUUYAm?= =?us-ascii?Q?1Io0fwV9vsbYyGVYNPOJzcdC3CRO+Veu1cMIEHcUssbgFxiUrrrVULx7VdJT?= =?us-ascii?Q?UlyYUr+aQz9iwIYWGlT7r5TPhj3svt2+czMpsRFSJ8z0xsajxScjYfm8rKoh?= =?us-ascii?Q?v2dIEAKjQq8bhM7CtEny5fNdMMaMkqhghc/XyLO2T7OSvFGovDbu+8HAtoyM?= =?us-ascii?Q?8ws7MQYXZnfungTV+1lwY31wYHf8jHTcUYCHRHSP8dbhJJHfV+4sa9DWJBYp?= =?us-ascii?Q?QlqFEVPNnEYnXfLrEWiotam/o4fHkrPLy3Nq70rnwabaT5cWIwScajZQmEjp?= =?us-ascii?Q?PFq94GeP/bRPix3hmpCtHuakQyRncflt10mAyf0UNuySkvjTYOPYwRFUNXMK?= =?us-ascii?Q?YXODsG7P8olCqUeABGF7L+CBU4q3I0YADfKOic8v+MSjULQDkPVji0JzQv5f?= =?us-ascii?Q?KLFLxNcXklDSk/Z/j/ylXzh0lHHaUXnPdXgHrEdqCmU8ISV6wcHM5uO7xJlw?= =?us-ascii?Q?ua44XVlLGdravywDREMIYLgEjBo50M0nTEEwBAAEj2iarQL7AgcAvXdBjvru?= =?us-ascii?Q?hwgbeUjvvno8+HcHb7AUOxjw0pGd8/PmmzfIDVpY79pgaHKyjqAdRjqepkIT?= =?us-ascii?Q?m8PB/zz0bBfsYYfZ9sK8ZseuUmmv6io+ixyg8CJG5ZAiC5y5hbTtc2sqy3nL?= =?us-ascii?Q?g2rPF1Qx3AzCJ8LWgnxT+edDedqtCaAQxDC5IHG7ot0KbxIuP8asQOu4bW2v?= =?us-ascii?Q?KbVgcK/mBGs9Jh9mpkIVgkyl7dYhB6JUM7xMEi3kcCzBJ+LUD/5wwoD27giL?= =?us-ascii?Q?ZPrEyE4JTMBS7bo8HnhF+Ds8hla44MNI7jNXSMTFlqE4YFSbH7a2JgL2TSzO?= =?us-ascii?Q?03BXrkWiS0dcUbaMcmE9a/iGktnM5xM/XFTYkVZqkYy0/PohLe+18Wg=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1453; 6:t6NuVejXwvqU3yY7Z40Cw0y0aKBmpR4mqckblY8REH+iEobH2BQ3mBAp8KeJ2226dkH6W53vO+3Vhd2TzpBO590+LYb6tRJNOjqWA8l/pFDjLPalXja8AHAkK0zs0Lba7Z+Yxr++ZDKPNcdSLMu/vsdXtAWkX4F6HuThjT7MnKphmhDn5gBGGG3RcHYgNIOGI62DJGg7LNGz4rK1xdz44Vd1I9XCf4abLMduaYHaNTU/M2IJmP4XVFqI0nUZUuyxT1bVRxBuetHeVtCt10zOIsGviYfPpZWDGafFsRokj0hg6e3AXd7V/0HnjCLaEmavV2HU9MrTTeq4hVK7qea20g==; 5:HJero/Yd8ekflCHa6+8cDxLgtDr4YXe8XQjSOlN5o8pyXDaS1jW33aiTijM+0ZJobKq+y0b5l8LMBNy0vTkt91BPbZAh4igsdDftkHArS/xP4ic6pXEUKTeMDcePddB+Sjovj/1D5HlAPhtLdPbz9g==; 24:MrRUdLDlTYByhhe4sRa2dQ/DHHJpVg5X0opU2OFyw1sXsAwPB5ma21ePt/oOnlEtRsqpR02E15DBK2uKHO1nCNJwVDBNh9mS9tpl5yn7NkM=; 7:SAqS3IJXR8R5eah0p/GO6BzzfWtjz/n30yJKM/SF6P7FsJtP/Kein0iOoChmc0tvfZXhshYCwuFNpczjNmBQdXALGsZzpcxPMXxqla+sJk11PU6c04v2j9ZyUqe78AO7pizoi9DEArlXBeRxanY6jmP+7KTepTkndfy8O9fozw9Zop5KXVYF+nigIEFTb3D2oVofZ6efYHQU1Ijh3yGHxbcQ3bmImTS9uyfGOpLuSLVFhLaWViyn3ay59bLvLeoX SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1453; 20:DwgwoQuacSKUj1qYDP9E+QEGaKzAErAgmJ6r8MpK1plyw+jamo7NfgUdTTipQmnpV6n7bnWN5ecvT3s1ftwH3M4IrZwOyuDgXMjPJPkKYeUPR3LubBWMdCxlV/z6GBpOTJIyoXkB8sgsR+NIiZf8HGw25kQVMj3xUQKCndrGKDY= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2016 09:32:37.1941 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: SG2PR0601MB1453 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/wm8971.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/wm8971.c b/sound/soc/codecs/wm8971.c index 2cdde32..214fa13 100644 --- a/sound/soc/codecs/wm8971.c +++ b/sound/soc/codecs/wm8971.c @@ -654,12 +654,14 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8971 = { .set_bias_level = wm8971_set_bias_level, .suspend_bias_off = true, - .controls = wm8971_snd_controls, - .num_controls = ARRAY_SIZE(wm8971_snd_controls), - .dapm_widgets = wm8971_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(wm8971_dapm_widgets), - .dapm_routes = wm8971_dapm_routes, - .num_dapm_routes = ARRAY_SIZE(wm8971_dapm_routes), + .component_driver = { + .controls = wm8971_snd_controls, + .num_controls = ARRAY_SIZE(wm8971_snd_controls), + .dapm_widgets = wm8971_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(wm8971_dapm_widgets), + .dapm_routes = wm8971_dapm_routes, + .num_dapm_routes = ARRAY_SIZE(wm8971_dapm_routes), + }, }; static const struct regmap_config wm8971_regmap = {