From patchwork Mon Aug 8 09:11:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9267211 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 ACCC160754 for ; Mon, 8 Aug 2016 09:11:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9CE9626242 for ; Mon, 8 Aug 2016 09:11:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 91D7727D64; Mon, 8 Aug 2016 09:11: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 51CDD26242 for ; Mon, 8 Aug 2016 09:11:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752043AbcHHJLn (ORCPT ); Mon, 8 Aug 2016 05:11:43 -0400 Received: from relmlor3.renesas.com ([210.160.252.173]:5901 "EHLO relmlie2.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751280AbcHHJLm (ORCPT ); Mon, 8 Aug 2016 05:11:42 -0400 Received: from unknown (HELO relmlir2.idc.renesas.com) ([10.200.68.152]) by relmlie2.idc.renesas.com with ESMTP; 08 Aug 2016 18:11:40 +0900 Received: from relmlac2.idc.renesas.com (relmlac2.idc.renesas.com [10.200.69.22]) by relmlir2.idc.renesas.com (Postfix) with ESMTP id A168F4F27D; Mon, 8 Aug 2016 18:11:40 +0900 (JST) Received: by relmlac2.idc.renesas.com (Postfix, from userid 0) id 9E5D12806E; Mon, 8 Aug 2016 18:11:40 +0900 (JST) Received: from relmlac2.idc.renesas.com (localhost [127.0.0.1]) by relmlac2.idc.renesas.com (Postfix) with ESMTP id 9862A2806D; Mon, 8 Aug 2016 18:11:40 +0900 (JST) Received: from relmlii1.idc.renesas.com [10.200.68.65] by relmlac2.idc.renesas.com with ESMTP id UAH12717; Mon, 8 Aug 2016 18:11:40 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'208";a="216936791" Received: from mail-hk2apc01lp0212.outbound.protection.outlook.com (HELO APC01-HK2-obe.outbound.protection.outlook.com) ([65.55.88.212]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA; 08 Aug 2016 18:11: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=53vJUuyKMQSRH0n6UjfUhndOmr2ui6F6r2lLSQya5cE=; b=KTbrO6zocwCFapSQVAKGhgi3kprpKGPqmnYBrlbLGDrgn2dTKXAtHjC+UOCzpUYDBCCiuT5A0WRmcYL/03AIS3JC7TucdkiacmEbDI4rC5xur9fCPmdocbnCLgj5dHR2nou3FphlLQhKY3y/VdR9pTUCV3b9lnMbmTE3RqKVaSU= 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 PS1PR0601MB1452.apcprd06.prod.outlook.com (10.165.210.156) 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:11:36 +0000 Message-ID: <87twev4opa.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 077/159] ASoC: codec duplicated callback function goes to component on adau1781 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:11:36 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: TY1PR01CA0042.jpnprd01.prod.outlook.com (10.164.162.152) To PS1PR0601MB1452.apcprd06.prod.outlook.com (10.165.210.156) X-MS-Office365-Filtering-Correlation-Id: 2717070b-2125-443b-e01f-08d3bf6c0061 X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1452; 2:gUh+3dAT0kZmhgwR8n93wysqmoJ/5iFrlKIATE6bRnksl3qlwej2RZV0Hnh2LCTA01tFmApVAihxXZqAgB7BXNZ7RCpgemr9EeNKrm+cWV7pDkFLInqIexJVjm81n6rOYg8ZVv+MNe1OjNAhBwoR+wvqO1XO/3enN64HarXUCSsQp1tbtuS9cHnJmRPCdWb0; 3:/hb/ylU2ROY+WPofdIB5HlBZGrq2p80/Uzv0jvsLTw4n/xyBbHRri7CrTKO33e5obeljW8Zs8H3HEklCMfsPPRGAw2/3YZJ9Aea9hy/fNN2kbN6f6to4BK1CJuh5NyNW; 25:Szn1o9MdTykBHclgAB//38bYcTQ/ON3PqyPHW8k5wJUasbkgrY1250iZ7lL7S4LXrP4yLTgPas5MP7FdU394nVJfcdZBVxIErnzP+5szmmJ5ok0IxDffW9ZgqEO3XU1m3kjCEiyyjDIu0JXsTLxr7V/opXnRtDq/JFCSICt4pqcBrRKt1dY0EMN2v7XlJyN7sLKJDu5vzHUaqm4mHArUFd5TGhkonU9nwJpROrzSrHFyEWiQbyIdm3CiRt4XOXTQv+oQEEmmK2up9Y2XLRK7WUwaz5xQM8feuxptg9t9fw8uiCmVIN71Efim+3D6mKJzKLM1Z7/wiCGYdk7Xxti+5Qtl2mvA8BLLZ/GIgZPIxnei+ZPBQKmBgU8oEUyXYeUdOalFtuJKfRzotZyUlQAFddeb+C1h0Lqm4v7YqsgZojM= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:PS1PR0601MB1452; X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1452; 31:cJNHvgI/dm3hrkkWRPtLzP9ExMzlESe84yuIZuIzl3l121wDrM2wbXWGExkY8TjbU6t2kt6V1K4d4J3pBaMXVPOX8LJ+NdU2fUaSNAs/hnUVbNEdVkEqK7C9Ot/KpMXxLUfmNM1UF6Y+x7zR1vlA0ooEMfOYjo9Hm0Eu5zvZhxgtncTMtdX80M72o/bfQhTCf3dGcK29hym2kfD+6n3Xbcy8NaSYo99+A7Rfvq4PJ98=; 20:wAA+GkZCM8H4U4UjvzluhE4svH1ksqb0NmMfOXyQIzjHUIJkPQYC5ZmcWAQ+tp9v+/scykxbzRRD1iG/Mn9eevcAJtW81uqhb/iVvdsgRcHm0rNIYygNMarg9R2ZDUOinbA+du0F0AJXKtf40qkJuo196uRqVMKFhelZp17X2OQnrcYsZELbxDKKECPEy/IjDNxbqNarKaXBzna4RQ4fEqt9QHlLAP1OJgTPooDD8Tn+QZtTLdvGmD5Gqjaqs+VG8JkfRSyJvwQwk5ago/F0yrcvlimUUMDW3EuFJgblG+kz6ZkWX14NZFxV50DPZJlnbymQm8hTvlrSEyQOOx+Apw4gkso4gaQbvrFzBMOm3rQEXDfkmDChgs1txnPFdRlabrUK8NhKSVZXiMZ8mb5s6PhqHDZsS10G1HilYNkbOqGR4Th0x4LsSvhyrMQGAldFUVtRb5ble+Em9o3rZn71Sy6giZzsxKdiEECXmwa7VImIQDTMUwpfZtThrfzXq6/H 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:PS1PR0601MB1452; BCL:0; PCL:0; RULEID:; SRVR:PS1PR0601MB1452; X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1452; 4:lU4pYH2F5dLf2bkMS6laujNKsuyo65V5kTQCmoBqyChu3lpx1fI6e2wL2o47Hx3FfQFXSmbuK9GcKys7HTRIEx8pnhrE3opn35HbwZ6GuQHpWpPV1cYLR268ZJybi1G588S4bPdL0mH7B6stHSk/zIO5KsupIGc/3vWXtD5AhMz8PcH7qoTz7IFxbaibJf0knAarv89UhHULuq/5l9OS7D8+yp0oMxFLaBHZScoyRCpmuRJDBloNZ824ifxVTgvvLszvb6bVNzZhgfkLTdHy03RmAm8a5owa+L3TzbKqWevoJveic2IvB8pnHK6np1Dw3xSbXc2fuoFnzeh/zMPq0IJYi6dJ+i23LA0ea5ztQjMhauxrIc+1iMfX7gXraj4MSdnb6hYIH8XsrLo9wlMDOQ== X-Forefront-PRVS: 00286C0CA6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(189002)(199003)(6116002)(86362001)(76176999)(3846002)(54356999)(23726003)(50986999)(586003)(7846002)(7736002)(50466002)(46406003)(4326007)(2906002)(101416001)(305945005)(92566002)(2950100001)(81166006)(8676002)(81156014)(68736007)(4001350100001)(42186005)(33646002)(36756003)(105586002)(66066001)(47776003)(53416004)(77096005)(83506001)(19580405001)(19580395003)(97736004)(69596002)(189998001)(106356001)(229853001)(110136002)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:PS1PR0601MB1452; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; PS1PR0601MB1452; 23:bcD/ZIsZ9v5RJ1ZaHNAGH/RwB3O3IbBq/Ysf8Bv?= =?us-ascii?Q?6VqLC5eUqWkrwAdkr0pZZQ0u83/wus6ZgRREChiGhnxX5+Fl307GOL1VeT6/?= =?us-ascii?Q?mH2RT1l3n3Ybv4WgI+tkCZiV6kUbfbC1qDo2kpIZNApSbSywnwCpxUeS+a45?= =?us-ascii?Q?8x/laasAwfduqqpQhfqgQHYKOrjOp7vSYmQ6WHIWAO1pvKOf+FHoxpVwZEna?= =?us-ascii?Q?fbptJYXN6IicF4TTOHJ1qI2vDj7EQwNNP7/8KvNg+MLtW5yfxEsHDrloFGu2?= =?us-ascii?Q?ScwZdJorc1hQhGELtfwDU43Voj6etkta7BLPDqxwh3I9FuB3jDTCOC3ZKBRq?= =?us-ascii?Q?tNCR+5AoSodvf8tVZ4/ztZo6vUzeFFktMB+AiDYiPJc44mCekX8qgkafU1ax?= =?us-ascii?Q?BOwq/D5bi5Pia98cLBHdTgx1xrzgIrtstb1CA+J0NXShQMWuW61qXJWQLXIX?= =?us-ascii?Q?U75lUUhjFL2Zq6LaAtxzZXDXvDqzcj3ZPBv/TQbUMOOucm84XCRcRTxMvD1g?= =?us-ascii?Q?oh+R71GZDPZX3N3HBAmB2n797hYQFXzwsyr73PQ9/KLG/bCB7HRyyqy+z4RM?= =?us-ascii?Q?3PKC1q7Nvzs6uMR5ICmZ7XKA7ChMaDbwI314/YrIlV76VbysElrhyk+k2u5a?= =?us-ascii?Q?0MlC89PAoTxY2lQeNvwEtJCT3ujHwtODoxGH9PuT3NLDtrL71oOqoJmlhmI4?= =?us-ascii?Q?fIpk7xPfeoCXSQasHo6uv7i+MNu02JNO0H2FfkA2HrcycetKq9Wd5nkxtLGu?= =?us-ascii?Q?Tw9P0yFmpHPC7R8DVfoIMh2w5gAfijLdU3wBLhkGUdZjbEZV5dgZLA6lQGdo?= =?us-ascii?Q?rlxcJDyz+ycPprI1asa/yu4kj+9/vA/zvNvCWTG8ch7FEVl/29aKCPRlihh0?= =?us-ascii?Q?aqXdYvChctVfjYCH378MFGhMbCRVLw0n4VGA+nb0S6Shy+OwEOfu8CCQ3pi2?= =?us-ascii?Q?KQ3QcPXyU+LVsEpV+/G5T1lg+kQ0AaX7fp7ruz/bPj/Ber/VOuZA+nA2fV+b?= =?us-ascii?Q?Wy+gdg2X4cNm+kyP4CZ+hI3/RGFriCX7d7kACSuq4av+TwmcRlzR9Ee85Ivw?= =?us-ascii?Q?gCUq3GOm75AfbXrxtWk3l0A70LRkLO3y8y5PPpW7AvR2qtMC0c4bIECgi2+u?= =?us-ascii?Q?IzQvFVHfFKHghDYbbRpDd3t9x92MrY1eD1jlKcjAj94Q6xv0+kbAheQ=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1452; 6:/v4Iljhk3QvuLHW1M+BHi9wjAIZLYLBtewY/lzEJDPDY/Lp50q61+A0mSJXIBMbQTs4gPJh0luoap5m01IpSy+iV7TFTEw+B8av2RwaawF2XOuxTFgHukpfSzWyO20k1yLPBEeuIANiZEhhGLes3wER3aA0tCgvDnNt5t8oU83SXl4w3gFQpAV59Ep0whgsq/PHYC8E/wI8+F4SHvHSIZDjBoHyWQRvgbtCB/T5oH0xTcOZKv+U3BZO3850dVDCj7ef/JyU8R8TgWiJed4lNGSWsRJE2Jq8G8sVKyWgiii0lrKmoryovCLdI2iB4NY7BaCQIje76Obc4OFYsp0B9QQ==; 5:hzBMNrnEIuIw9m7uiqYdDIJL41HesiTz5qfRN4JbfFAU+/omS94OEhm3W0iPQYrp2y+l8anKdgXhXvT270eXUFE/7OET9oCNvzFQhKG7Zs9AYadutwbp6hcdGHB9oVWQ53g3fBr5DCadgQmK2lLOjg==; 24:zrHUkVMBnMBIfvp3DwXOrCA78XaE52xAFQ4xQg9ifTfTYHuwYlGmJh8ZzBoMl5lteMDl5pBbDs+BDuhI026M7yqTIKgbA6QVz07P48vYwRw=; 7:Gomb+8511vcFXb7CHY1JJ07wPG2yhBtYtpyIr2GcZLq6AU6vhPE9SN8bJ/W+PNWKTwCXOvPSxG9ZbEgOScybSZQCzD7MYOoGsKy9ySncbFN/iSdXbbSU4Ldm5ZTzHzpAptoF0tiCD82DYydeVB/gpq35m/WLabyE/+peUr2uuBBC62O83QpF5rso74Sn4rtuXW9LeVSQyxCn+Q7IInRxmVoe+8QWq1fXCyA97gqG6qf+fiT5Wx7ZaFjtggrPxx/U SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1452; 20:vy8mm8OhpBKsdy6eQV+aBR1GIJ10jfbHVJab4du0lUOX/c0g9CfMMAsjxcGMJhHCyDimIu81LTCU0ClhoH3tr+9Q8DLjGuXUX2Jq0M7Vwq6pFzlMN4d2IHbC6toAPcG1nvaECQKBoxMrp7vIgSp0pENdsnD0RE5HqRFG+YJerHc= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2016 09:11:36.9556 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: PS1PR0601MB1452 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/adau1781.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/adau1781.c b/sound/soc/codecs/adau1781.c index bc1bb56..546071c 100644 --- a/sound/soc/codecs/adau1781.c +++ b/sound/soc/codecs/adau1781.c @@ -432,12 +432,14 @@ static const struct snd_soc_codec_driver adau1781_codec_driver = { .set_bias_level = adau1781_set_bias_level, .suspend_bias_off = true, - .controls = adau1781_controls, - .num_controls = ARRAY_SIZE(adau1781_controls), - .dapm_widgets = adau1781_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(adau1781_dapm_widgets), - .dapm_routes = adau1781_dapm_routes, - .num_dapm_routes = ARRAY_SIZE(adau1781_dapm_routes), + .component_driver = { + .controls = adau1781_controls, + .num_controls = ARRAY_SIZE(adau1781_controls), + .dapm_widgets = adau1781_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(adau1781_dapm_widgets), + .dapm_routes = adau1781_dapm_routes, + .num_dapm_routes = ARRAY_SIZE(adau1781_dapm_routes), + }, }; #define ADAU1781_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S24_LE | \