From patchwork Mon Aug 8 09:18:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9267287 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 AC1C760754 for ; Mon, 8 Aug 2016 09:18:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9C30B212D9 for ; Mon, 8 Aug 2016 09:18:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 90BB527D64; Mon, 8 Aug 2016 09:18: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 03FA1212D9 for ; Mon, 8 Aug 2016 09:18:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752005AbcHHJST (ORCPT ); Mon, 8 Aug 2016 05:18:19 -0400 Received: from relmlor3.renesas.com ([210.160.252.173]:57258 "EHLO relmlie2.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752020AbcHHJSS (ORCPT ); Mon, 8 Aug 2016 05:18:18 -0400 Received: from unknown (HELO relmlir3.idc.renesas.com) ([10.200.68.153]) by relmlie2.idc.renesas.com with ESMTP; 08 Aug 2016 18:18:17 +0900 Received: from relmlac2.idc.renesas.com (relmlac2.idc.renesas.com [10.200.69.22]) by relmlir3.idc.renesas.com (Postfix) with ESMTP id 53D8B521E2; Mon, 8 Aug 2016 18:18:17 +0900 (JST) Received: by relmlac2.idc.renesas.com (Postfix, from userid 0) id 4BEF62806E; Mon, 8 Aug 2016 18:18:17 +0900 (JST) Received: from relmlac2.idc.renesas.com (localhost [127.0.0.1]) by relmlac2.idc.renesas.com (Postfix) with ESMTP id 47D862806D; Mon, 8 Aug 2016 18:18:17 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac2.idc.renesas.com with ESMTP id UBC14749; Mon, 8 Aug 2016 18:18:17 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'208";a="217447264" Received: from mail-pu1apc01lp0023.outbound.protection.outlook.com (HELO APC01-PU1-obe.outbound.protection.outlook.com) ([65.55.88.23]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA; 08 Aug 2016 18:18:16 +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=c2XR+KbshBZZ1QdfWJO6u8Q1xcoGyNPTIAreF97GANU=; b=TrzLUt3c6udVDwX8SlPj6wGuJYlG0B0MmXAcMLX5qmFEUUBWFujoCGUAmk3vwjjio7PG0Awb7G1YftZO7MlIrV22qRVgq7GZ3c2/H9XsCboFlP399I+sYPNT74SQwsv0BnU/LFUQUmcBI2lWi5hyqSOTLjnrjwpzA1rcNk99wf4= 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_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.549.15; Mon, 8 Aug 2016 09:18:12 +0000 Message-ID: <87y44739tw.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 099/159] ASoC: codec duplicated callback function goes to component on wm98095 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:18:12 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: OS2PR01CA0003.jpnprd01.prod.outlook.com (10.161.74.141) To SG2PR0601MB1453.apcprd06.prod.outlook.com (10.169.106.19) X-MS-Office365-Filtering-Correlation-Id: 71cd4ed1-6518-4d85-6a5d-08d3bf6cec35 X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1453; 2:6xHURI4Fwja9QrBeOeuUARA91KSBkMRvdMD/GZre/aWA0Jt3JUlrSnvSbfKjTB+V+CrZzjTIaunTX0XofiQm+wiDX9CeHJ8hhyZH20Z9640Rkf5Enuh8YF63mVOxXKNcW6cQLf7WP/gzjS8dfArRZdOWbo/61mYKBq9pWHHW18EoBzrlu3s04Kda7rwY1+i+; 3:gisnIYEqfYHe8NIbAyxshJ1E53tZMkE/4L31/kPdMkfX4d7vNE0FaQUmHP9HaLmeZV4g9KtEmQEtLQLnVaI9hcIbJD8vDVlPyVsF+bLoxQ+cYbof2xg/oNZQgBmM2lpM; 25:EZMq1Pvo/2l8JM/ossd7lhmSTmRHT1zQbGiTdEQEe5CamkumFqoNumrMM5D4aqGI1IzSqO11w6fUWDtNM/XRQ8YQ5QAD2TiaVfPl5vGf1uesr7n3KsL6TjSKOVnwsan/FkjrDbJLpDLuFk2jNgrI6tRB+ZRAmCU47DhMgtcDPsBZ3qAUiZJo5K85zLvqju//5WzKvUBUhmzqzeSRyGwzXZEC9IRIZBYDgE0hxhKBGbWnCEBt5paGNtaImp1xiJwsUhCIkWUryU2E7bfmaMUTITig0vRqoAXlo6g/mTl99ZaFctfTI/ZtsyG9D+mk9xLHWrY++coYoILb3GpRzYTmpQrttwrtJWJuflKVtJtyZ6MTfxRi9uP6cnx0AVwvVOeiz9bLmJtvID4AvMrxGWEYfcTvXSHbnx1eYHGtapno67M= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SG2PR0601MB1453; X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1453; 31:3PtNHklkmiv++A2RPph+ZQo0pmrT3pUt9Fu8QKlF8SwFJ/myTr+8O8GTGsVPyjA4pyNi7Bq9wJwi4suJapbMJTSuJxtu5E4Yo3s6rP1HVa8EmLxVbFvJoNPl1MFS7Xo74XdtVDrtamQ+1MLTQZKh17zLqDFUz9/uDMTVht9/KWZd2I6AJg+GiusoOem7YrGks2KfRspedRbwob4hj6xcPc6l3FxUMl4MNdauiZS2PRE=; 20:v/Z6WPdMpsXBQMtVJ8ulC+qjeyqSsQby97tgnmlatfu2DvreYxXtwLTkyhfzOg33TZvBBNRckFyEjV+Wz54oIisGK3fZgxCL3jF1uAfrJFGYAIErlkSVRLxZutg9SqwrO5TXdiYarzz0XNMWHCLNAqCgP/kbEz0gqVBa2bGGTd5OmoB0kkf9Z/55wf24Odm69fRsOXc83hhl5mKNZsB2EXUsgFrQzxY/bOhl5QcU9zhITrTIHGIzJMJ5AnzzescffjbD+cFgXCdpphOoCiG1Xtc4ZgMOLe7koccPTmtU4KAnNmSJzryqPT5K8AAmFPD2GlhdW0eWXRMP50z4v1UEU1F4jX4JEgXGYXshB4y1PRi7XJ05gWqELzYxpS+9xpIFSrHfXOv3E4HxFp75nsuZajNSQhqEo9J3ghzZXjTeQzLOJWzIuoyP6pTq63njFhh5uRXiBd9j8ku6huBWis6rXCA27feTk+G1bZ2mdAFxqmy5bQWfCkMnFkBV84Jd0WzA 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-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1453; 4:i8MrLq6kYRbdedRfcAAy/j0Z4T5B/ZTa/ZiF7tRKaAmqRdjgz4uhz2TAlbL311jp8QyoN0rQx++OVsYtdAXdNiK6ZwMvCRIGrbUBt3xgrJIzR5TFG95ZCjaL6c74e1y/S1ZG7XHiKY1kCkPZ1VSpXJRFH2H5c8aBEmdSQinOXX2IcCCDPECqI3G3YGUdY7BeqdCCR0fkM60Xda1HCziqrzFYJgJMNFXaV5RXbaSI61ufmrosSdLRaQdVPaE2mwVgiFTnPPA0mWsaW5QYcgzpqOmtyKMeqc5OWrO4QYVFuO1Qp08Otbm0f7mLAHGL4FaEzL/uJBeKW9u79wDo7R+NcwRnRxG/KPIiWKR8Tzc2rnbwm/yaxgJRler+xh2bKho1l0YiP0eH0W1SjUSjwoBt1A== X-Forefront-PRVS: 00286C0CA6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(189002)(199003)(69596002)(101416001)(33646002)(46406003)(19580395003)(19580405001)(50466002)(83506001)(76176999)(8676002)(53416004)(50986999)(54356999)(106356001)(229853001)(2906002)(6116002)(81156014)(81166006)(4326007)(23726003)(77096005)(42186005)(2950100001)(68736007)(47776003)(105586002)(586003)(7846002)(86362001)(36756003)(66066001)(7736002)(92566002)(189998001)(110136002)(3846002)(97736004)(4001350100001)(305945005)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:SG2PR0601MB1453; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SG2PR0601MB1453; 23:YG78lw2BY8rwWx53QiRUbRvlyKGNRPOvrv40qOO?= =?us-ascii?Q?fcZ98Oj4xGIppOnlFlKvZp3x3kNeZDuNTd+HUIzM2Gyc9pHr6OM+6ezm+fJH?= =?us-ascii?Q?I6SkhcTjeo58vlvPMB/dSHj5yOZJbawNUX5d4O1Xb+CCv8A/U7evzLepoj3+?= =?us-ascii?Q?VR3sbmO9k+mT9PEY8HwRuVvRVDUg/aUzR0wcKU/Ii0vDLSDaVOTxSzyIM47L?= =?us-ascii?Q?rmdcmJt/ghd0wIs15DTiMpZ9QJesDZ6Pr0CwWU3gLbmy4ApsX0x9vtHQIqfh?= =?us-ascii?Q?ePyPTYAjReWjP3kkKgM5YORNI8vHWSiOig7nxmVPQDEFr1M6mw0tOKigrKfp?= =?us-ascii?Q?7CZc8BY40hXeHTIrPKtD9vZokAME4fxPHJo3AZVfIjkdlBaPUYNC7YLw/nd6?= =?us-ascii?Q?x1xF2WoKRZccXRyHIpu9RiS168Oj4yiA3XPBoohcc9NmD+gU49CpZuOmvcil?= =?us-ascii?Q?ndOBsPITRhdlVwLs0batPHiiNaWWsGPtNrNbdnHt1Ncmjy5a/Xc8EGjqG6wm?= =?us-ascii?Q?aqx6oX1/zlvYtI0xZseLDVbE5Wuj29Ly8CrxdEADh8Xt/Ml7auPcgHYr2+4f?= =?us-ascii?Q?E/YVfNnPFVhMW+UvMWRgupMrozGE9AJd5VzCFdzVJUDuzjEeHfOcSQA0kgEz?= =?us-ascii?Q?JQJXwccOdlLwARyD/HCgAPfnJ11r2EWdNyxzUaZN4yKcLe836880shZQf49K?= =?us-ascii?Q?CLkQaNedGQ69e+bH+mbgERry+gW2BFigoTtyaxg55seV88wnb0TtEUsVBXVE?= =?us-ascii?Q?HQGibpSN7DhqCKm5AS5mVLuFcveRdYTXK/xWc8ym8EhWT86xNdzyZTHVBFWh?= =?us-ascii?Q?A0SycdznKP0KJaAIpAVvQreHrwRlyBTbUA2QWj+ySfYsdTgkq5uCqQfQMRzd?= =?us-ascii?Q?rg3k6tXg4h6RA6+h0g1SIpZ4pYMAM+1JqsFv7snOWXT8xnyEmuaWLSPtvHPw?= =?us-ascii?Q?9faSLFLHNxMy8yCKRWJQttHWce3so8t4JFcIAhJatrR6VDy58oXN7PSiYZel?= =?us-ascii?Q?qPDETaBF3gbOu4CEutsEsZsLEq/n7pJNecFZIQWtzqttccgivPbgz4UGPFJO?= =?us-ascii?Q?nh0X9n5R55qRnnr7hgzaNeBdKbeQRHty04l0HcLmXPljrjIRalRUQNrQ+iu1?= =?us-ascii?Q?y/gYuPPnIOwSlgMdQSMv56Z6mvhrJFn1TXII7F+NjYQZ6T68KJL8aBA=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1453; 6:59B8bJXzyCQ9MokvRCBXS3OtYnc/NW6pAORGndVy2MfT1t4LX2miCz+0wub4IlqJUX9lHYrKfmohPH3sq0lXTOt9a5CTNudAxwSyjTDVncUY9O5Xy0wT21fGk8pvXuk4z0asvifZPL7qyp+1g5lRqDuMwNCvBS+F+VKer1j2/Hx++D2/SorovSKIVUJlF9KCFihXRyFn+3JExmwPkydOX31xgPJTxU2j+9FVDJaN4qPSHZBO8ul04nH+WBm+otGJMUBZFlJ1pcZ82iO+GZcSOPnYV0Rt3168JntMOVBt0+1hkJ12WARlqrr5l71HBa+LtRsreSCXFu/q4Apcm7YpPA==; 5:thliiewLTwqS/zufZwzoDeC5Foy03EfTV2NpObJjMtyZO7BGWNFVqPfXP4kSdiGQq6WxJNKcn0MLGQWr0+AZ5GxTP9SZCIjG6RkDcgInJvd6H6K094T/JqY6VkQR+craeAiVDFVaenobAAYLYcZ2bw==; 24:mPuQwS94LPvr/d9KrFpL7x4qpHaO3YA8ThL+9UvlyRxFkCaqlK9Tgcq86PdbZNgxpiiWLL480xWjUEuqYtNOKsDftWOHFWYsUQCOEGGWA10=; 7:6Ee1BDuhxJ0HQsWQMn3aDkcNnYkf6z7u4N4S44Qq8EtczJcjO5DqwASiO3o6MN+yIq7optHTTGhzM1brxMTKq0HRSxhULtCvzm6nwIyO8ehcC9kmxdg0GBEism+Efv/a8BnWT6vX6IL8fxpBoPUf56CarOHF2Jv8ccfT7AtazSpf36d6mCXX8aheglst/VkQMkA/+BJ33NMVwamKOvuMa56nT6zuApWUGWSmHn4bmyJp3tKRIispNAIQxFcM7OYI SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1453; 20:YAF8h/0Fsw8/HycqY87ONVcRxgOaGUMXlLh73FoVct26WiwCktuha+CUO7sF+YX3l91Ie3sY9+2Emn9Cg6XIsPtD3i4s66Vkk7ZP7g0C+okjWQQtbbe8Cs0MyZCLYafNndMc9JKe+vkfnCynqdO5Q+heQCctrt5tYwdtumVK0Mc= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2016 09:18:12.3313 (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/max98095.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/max98095.c b/sound/soc/codecs/max98095.c index 3577003..6f8a757 100644 --- a/sound/soc/codecs/max98095.c +++ b/sound/soc/codecs/max98095.c @@ -2108,12 +2108,14 @@ static struct snd_soc_codec_driver soc_codec_dev_max98095 = { .suspend = max98095_suspend, .resume = max98095_resume, .set_bias_level = max98095_set_bias_level, - .controls = max98095_snd_controls, - .num_controls = ARRAY_SIZE(max98095_snd_controls), - .dapm_widgets = max98095_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(max98095_dapm_widgets), - .dapm_routes = max98095_audio_map, - .num_dapm_routes = ARRAY_SIZE(max98095_audio_map), + .component_driver = { + .controls = max98095_snd_controls, + .num_controls = ARRAY_SIZE(max98095_snd_controls), + .dapm_widgets = max98095_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(max98095_dapm_widgets), + .dapm_routes = max98095_audio_map, + .num_dapm_routes = ARRAY_SIZE(max98095_audio_map), + }, }; static int max98095_i2c_probe(struct i2c_client *i2c,