From patchwork Mon Aug 8 09:17:54 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9267283 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 B616F60754 for ; Mon, 8 Aug 2016 09:18:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A5EA8212D9 for ; Mon, 8 Aug 2016 09:18:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9A95E27D64; Mon, 8 Aug 2016 09:18:00 +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 16C4A212D9 for ; Mon, 8 Aug 2016 09:18:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752044AbcHHJR7 (ORCPT ); Mon, 8 Aug 2016 05:17:59 -0400 Received: from relmlor3.renesas.com ([210.160.252.173]:6047 "EHLO relmlie2.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752020AbcHHJR7 (ORCPT ); Mon, 8 Aug 2016 05:17:59 -0400 Received: from unknown (HELO relmlir3.idc.renesas.com) ([10.200.68.153]) by relmlie2.idc.renesas.com with ESMTP; 08 Aug 2016 18:17:57 +0900 Received: from relmlac1.idc.renesas.com (relmlac1.idc.renesas.com [10.200.69.21]) by relmlir3.idc.renesas.com (Postfix) with ESMTP id 9FF22521B0; Mon, 8 Aug 2016 18:17:57 +0900 (JST) Received: by relmlac1.idc.renesas.com (Postfix, from userid 0) id 977038002F; Mon, 8 Aug 2016 18:17:57 +0900 (JST) Received: from relmlac1.idc.renesas.com (localhost [127.0.0.1]) by relmlac1.idc.renesas.com (Postfix) with ESMTP id 921098002D; Mon, 8 Aug 2016 18:17:57 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac1.idc.renesas.com with ESMTP id UAA11418; Mon, 8 Aug 2016 18:17:57 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'";a="217447233" Received: from mail-hk2apc01lp0215.outbound.protection.outlook.com (HELO APC01-HK2-obe.outbound.protection.outlook.com) ([65.55.88.215]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA; 08 Aug 2016 18:17:56 +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=p6djnqvmYyrB4XhZkS9bO9BD/cMe7292rbXQbFKByso=; b=g/W9pI/wWEbwHyP872hLD5Qtm7W3oUlgZpLYhykIRP1jlfAnllahMRWLRo4AhZ2HYThZIwiVeFtA98HLi+pSzR8atk9QHLwlh08Ubie3vcwGdEjpIaDPeDejhUux5aePoStYzMG7z181pqnamw5o2oJsErOaIe5ieVVZdO1Iin8= 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 KL1PR0601MB1448.apcprd06.prod.outlook.com (10.169.69.26) 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:17:54 +0000 Message-ID: <87zion39uc.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 098/159] ASoC: codec duplicated callback function goes to component on wm98088 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:17:54 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: TY1PR06CA0013.apcprd06.prod.outlook.com (10.164.91.23) To KL1PR0601MB1448.apcprd06.prod.outlook.com (10.169.69.26) X-MS-Office365-Filtering-Correlation-Id: 38f5329f-0057-4daa-eb9e-08d3bf6ce185 X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1448; 2:IPWTdsIvl54lSIs3bYvmsg5JHvDCroJjOPRb83LvzWVF7ZjjKNvh1HXg9/c+2ITDTmps1qddxEDvsIeVATuaas7zEAd3LSU1fxOvnu7zIEyPsalvYkxLUUUc8RSUYe/+kbamLs17R7NaeOy/VYbNqg0MLk4Uh4DcGUn86ka8A+LthIsDN6xyyINCbJqQCiUU; 3:ttQ6VJTRsJ1Oi6SMQiMtF1QZbA0TwjR2w1gd4F8xTWghVvfcDESIIRDDW5fRc4JbO8HfqYs3YpVHeMQRn5ftVD94lcCEUAjAuQ654beEa3ZsfKsTGqbL32hU3QNSCMoY X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:KL1PR0601MB1448; X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1448; 25:ZLtkhDI6oXRIWP7pjGQuKJp83g3hPbspGa87YL2u0oa/fS4MF0cdTUNOIIgcjs0/Fcz6+NCsdT5d02+jk5Dhikk/yqOzBIdeUSx/cOl0sck0lhSkRcXiKHEofxh/KHFL2e3Fe3MbnjH/OItHhaLSW2w+OraaheNx9OJnHTuDYr0FqJo4Z8tBgD0YfDEkawnU8iGqRfISy0YjCsFF4+9glCrQR9DtI0Yb+udMxYv6Ubl8kbFd8FUUdkfvoZpWEn2FXma0gDiWzmh4OwadhSeTfMwz8GLfwzT5mmxqkGgPcGWHVvjbzmGemhngFHp0UYQTcwopugmByrToOcLNWexUnhIFQOwtfPHC4FUuVqsO8Yzd9ENDYBxCgBmEK15m3v/Qw2Kcjz/hXXotLn0813E787pg2qCm2gFdezoLSNEc09itGJ35UT8BCb13sUxBB+HakPOEABq0zEMCMStqH6IYLCxTUMWFKnNQ0uBaIFKboENINjAxPe0FWgm/MVKaU1mmjVIaodTZ9+IXrXketJEeHCycjcUnxetsKxKcLwIaygYuFUHzqsdNS4XjVRqLXxvef+84PteJIqO3h50BN0C5UUA+7l7ePjvRrocDEVW0vgxG2sA9JWS7L7QIPDQItfokcyLyTY80+eEOa11Jq2ZrglMSukiya6hp+5wviagOnPxP2TatqJnPquY6V3s43Hk4DtlwvLbiE4vTVGGmdq07WA==; 31:w4iS+ZMM7TSZs1hP6SG9XSM9o9L8l6asBoesk2mXWbIX/L0LDAas5arPd/dlQKSy2R6bB2OnHXmJdqmiAfjqCrBgd3Zp30IvnyypAh/M6vWHCAwnMX4b9oQ+KQPIRLFCAk1J3S4X4ozfgYnfi2E6YngYmuN36ilCkjXE5i5VT0p4IrwdbzeQdqEBbY3QXU6D3h6+6lhL/pi /48c1h4Bb1gdyHjIxKcxQtbsxsmOdbcU= X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1448; 20:1BYnedWeXFjfPPWO8tOyrN+ckiW2qWIwVUeRw/8N/VRVBzFZArR2CuWeZWzXsJ9tbBv12kr+UXpNiD0ffNqE7Ltc9E6FtUtz8vBgz1W67NsuFN88MukJ+OCOBBwp0z9ZEXMiwJEeg/KqOtR6KyV9DdFOFjFIm2eFmmJ6K/ph0DehhS3V19dVzpKAnChrMRoq7LQKb/dWThTNFioBnQuGdTkAiP7828FxlTHHSkWQsL+C373F/1yNi5ljSa5z4WmNCcNL/PyjWZz9zvB7PVjtxDwEdWpoMCucvGN37H+57RWQLcbufikvksJZCK6RvLsCPPDacyRHRpUM/bwYjN2VFqKFFjCcym/I7W8ejzL5XwUvRssnClI5pzskAam6vBAvKA4Qrd4VY48JL9J2gckgQ1hS21hpsCpQJWc8QnhNvOZ4Dy8HYICkFtPECiZXuJ03LYFVh9rPEKkRRpNJN3AgkXUNbRIyq8Un3yVffhKXCEQrMofL0R/dm/TadvkbVlqc; 4:Lgtnpy2R7w0o1kDPlPfxGxdNWD5CwYNFWbO+PrE0vYPLoQnFia4kiv96vLr1LictqDSE6lYAI2HjMttvMIMYXh8upi9GXUryEXilqx2sSQwIoMdg2rPiJoLms8n8MOt3eXjOGXTjP0llSyvjQ9+t5vNSLrcJl7+CM8hDWokKdEac5ualzy30oIkBwySObthLOPUW/2L31f5Ej0wZcuId755m1QpMUy7fvu91UT9+V36X0ODxXU3RQUqFK6xQ2t7UwEchtMvmhH9b6rY5PCazpeQ7ITLjo0lbLOjKGnTOX875qrocDcu9tChOzty8xrg6Y8rVXILHcUA6EOShC35SbUQFDOtdXVwEiSElkgUZO3Uyd3cQWpa02SDZ7XoZ+GSGZYvGL2W2xPNhPvqwekzdiQ== 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)(3002001)(10201501046)(6055026); SRVR:KL1PR0601MB1448; BCL:0; PCL:0; RULEID:; SRVR:KL1PR0601MB1448; X-Forefront-PRVS: 00286C0CA6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(189002)(199003)(229853001)(77096005)(105586002)(81166006)(8676002)(81156014)(586003)(86362001)(305945005)(19580405001)(19580395003)(7736002)(69596002)(2906002)(83506001)(7846002)(33646002)(50466002)(2950100001)(47776003)(42186005)(68736007)(101416001)(97736004)(46406003)(3846002)(189998001)(53416004)(106356001)(23726003)(92566002)(66066001)(76176999)(4001350100001)(4326007)(6116002)(110136002)(50986999)(54356999)(36756003)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:KL1PR0601MB1448; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; KL1PR0601MB1448; 23:5sIznAAFhgZVJDzNlFNthh7TSBshtiQX5CBUjT6?= =?us-ascii?Q?u3HfM/Ue46k2yrTEgHHfVfu1Oa1bA+eo42QseBRNOdyYSAsO9DlrMyfFG8rL?= =?us-ascii?Q?TlVvUt/pWIkB2edSIaDKm6BMGQ1kz9jWprFEnLeecylGYAQGGZ3Fcq54zZ7t?= =?us-ascii?Q?sHSPBd3/1ciA3S0r/Hk2Z1JXSuS4axdvCcWLkCOwsw5VfZdBkNrMYHT5IvoE?= =?us-ascii?Q?Vwenmgj+wCj7vn3aT3krTMT/BggpHPHFqN/W72D6BNl+iBD5IUOMG0CA9lGR?= =?us-ascii?Q?Ijl7/xYgQXdOOzzCHlmCgwe5VcfQVNrzLznfs5/+VfmnAVfXIM53mvinhh9T?= =?us-ascii?Q?8O3okXo66hZqPNqMkmdHBX+fZqEObK/4giVLhhA9XL1hzO0PwjExfd13KBDK?= =?us-ascii?Q?F+gMOhMeX4O/ERr+u410uSWDhXe4zIS8bLrZ+nR1b1iUE4RykTsawH6EjJcR?= =?us-ascii?Q?kupmYbkThqXfy1y8BYmcf0LC4VilizSR5pquQghNCg/9pIUohGIugd79fKsY?= =?us-ascii?Q?9NQepM4HA9Isyu7ebmHmhxsayYFehaB2+2PjPqZqgaPLrba/vXV0BNuMzLpl?= =?us-ascii?Q?BV9FHE9UM1OWGWYoXofGcIg1zZ0HKsc3FyjhLOqKPwzQfHhVKHQK0kyC1O6T?= =?us-ascii?Q?BfD+5A/fLkJ+I/qHiq6tnsfOacg4U7HZwQSYwYVEIWNMtSBvTOuzwOR9bSCM?= =?us-ascii?Q?vx8MlzfQsz4f4vf96WLPBhhbYFRAqfQJbHCgvMamNXjDf+zPYdJj56+s1ok0?= =?us-ascii?Q?xEbqVHK+o9iQv/ZgsCgP83i4jO1GdrteatcvfAtzgDLQ1avk5PCupmIZvgM0?= =?us-ascii?Q?ddnlSfGKX804owI72VWCFeZSitaSzolNJMD2JZBdCiwgtFh6qSRkZ2ubQSWq?= =?us-ascii?Q?+aPURdam9qdOZj+oFfncHs9c7lut6br7cEK145TwQPsPpZuSN4E48ND8gWjc?= =?us-ascii?Q?S9/7QO6QbeqdHHyLKzKVF90n8S/kp3qWnMWa6lC4/nl9DpSiUAdVzO2n631G?= =?us-ascii?Q?g7ey2yCutlaTHn2MgVm1Qts0afNVCdggsFq0WayJcP7m8iTofGDR1vgGS1Jx?= =?us-ascii?Q?MpHA5MM3eajaI5/ygOdws5miN112/Pbcy1rHuhUrlP6n6bdQ/3dDeeuCV2NU?= =?us-ascii?Q?/HkmfufuU0klLwnYzg4gTEFIrfmZHIDMLuUjqsjafpu4DRqiqf8RjGA=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1448; 6:7qigdJvDUafzBO6k/iNx28DrHYrC7LsVRswVO1SnbVJA68+35Qh4ZHsAbJi+RHUDN916kaozSHiGJ6FiPdn3fuVYa4ZAzuFiIHo3TTSLmw6HBJkIxu6WMDH0o76DTTvxBMqmZmbMouMiF3SdwD5xud3/4pSk35mZXlfPbK3Z5Z2RACIWmdcNWyH2vEqvISYVi4+f7i1c+NExuH7swi1I1MP0f4dxPnPjr4fPTE8lDvwYCre17f8Zk7QAWbPLBioQhUHsjAhQQwlB3ocoXTzMWxkyZy6CyGjB0TTx6jQSahxPycalXyJG4I20qE83MxpG6IxgzcCyAnr4ivrIaew2LQ==; 5:Ka6pZU04sfJ5MFo1yAvUWHM/vODe62c3bokdoLYvEpUXrItAMOkNUjU0tSVJ3B6es979NnlnSNpJg5BtwpDKHPJmcZtBiFtMZWeinieBjQUsBI0sDsYhPBjILub7uY6zxZMemJEYCnbxW+J+k4RQUg==; 24:y/Re8a8LEur7euEJCDxm7USK6oneytDLObVSppRvYq70XcY0a5gOzJRoNNVADqCV+fsduE4ZC1QokMH4Fj4UNaAN+Sfr23Ki9HaHItIVQpw=; 7:QpykoVua+nxKRe1ZYEPpnjnYhkSWnhl6UEfg1D1UADUzkh4X+jOoURcx/MdM/muTds3wHkuplh8y+LN1Hg3VOPAFG4MiaekpAAo1jsonuyzEKiysoR2WnfANELBc8GYqGBsbdOJ0wy0mlSRUmk7QfulvVfnH1STr+C1WXLHwCAZ+KurUt/qsnpkMStSOL4Dz1qksHsSUr9HXzLXJBF3WLWYFvK34WEckmB2QngAcE4hwS1+EU5rAXojBginwkoYd SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1448; 20:mBqIv7nEGFVFN4yr92qLdnn86j98IeFgJ1p8uDeNdj2+2BKcKKKUXxeX6BEkfEifWErCTLosB89EilvvMrq/3L706bSOnV0AVme7QLy/E9RZL/31jW8SpNaLkgiiwg54UjciCnaS7Z14m8OwYZiuh0crCQ7DwYj/8bHdD9eupFM= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2016 09:17:54.4469 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: KL1PR0601MB1448 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/max98088.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/max98088.c b/sound/soc/codecs/max98088.c index fc22804..72f7745 100644 --- a/sound/soc/codecs/max98088.c +++ b/sound/soc/codecs/max98088.c @@ -1704,12 +1704,14 @@ static struct snd_soc_codec_driver soc_codec_dev_max98088 = { .set_bias_level = max98088_set_bias_level, .suspend_bias_off = true, - .controls = max98088_snd_controls, - .num_controls = ARRAY_SIZE(max98088_snd_controls), - .dapm_widgets = max98088_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(max98088_dapm_widgets), - .dapm_routes = max98088_audio_map, - .num_dapm_routes = ARRAY_SIZE(max98088_audio_map), + .component_driver = { + .controls = max98088_snd_controls, + .num_controls = ARRAY_SIZE(max98088_snd_controls), + .dapm_widgets = max98088_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(max98088_dapm_widgets), + .dapm_routes = max98088_audio_map, + .num_dapm_routes = ARRAY_SIZE(max98088_audio_map), + }, }; static int max98088_i2c_probe(struct i2c_client *i2c,