From patchwork Mon Aug 8 09:23:07 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9267363 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 1ED36607D6 for ; Mon, 8 Aug 2016 09:23:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0F08D26220 for ; Mon, 8 Aug 2016 09:23:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 03D3627DCE; Mon, 8 Aug 2016 09:23:14 +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 9A52926220 for ; Mon, 8 Aug 2016 09:23:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752134AbcHHJXN (ORCPT ); Mon, 8 Aug 2016 05:23:13 -0400 Received: from relmlor3.renesas.com ([210.160.252.173]:30979 "EHLO relmlie2.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751985AbcHHJXM (ORCPT ); Mon, 8 Aug 2016 05:23:12 -0400 Received: from unknown (HELO relmlir3.idc.renesas.com) ([10.200.68.153]) by relmlie2.idc.renesas.com with ESMTP; 08 Aug 2016 18:23:10 +0900 Received: from relmlac1.idc.renesas.com (relmlac1.idc.renesas.com [10.200.69.21]) by relmlir3.idc.renesas.com (Postfix) with ESMTP id DA30C52485; Mon, 8 Aug 2016 18:23:10 +0900 (JST) Received: by relmlac1.idc.renesas.com (Postfix, from userid 0) id CF7168002E; Mon, 8 Aug 2016 18:23:10 +0900 (JST) Received: from relmlac1.idc.renesas.com (localhost [127.0.0.1]) by relmlac1.idc.renesas.com (Postfix) with ESMTP id C0EE28002D; Mon, 8 Aug 2016 18:23:10 +0900 (JST) Received: from relmlii1.idc.renesas.com [10.200.68.65] by relmlac1.idc.renesas.com with ESMTP id UAJ13381; Mon, 8 Aug 2016 18:23:10 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'208";a="216937743" Received: from mail-hk2apc01lp0207.outbound.protection.outlook.com (HELO APC01-HK2-obe.outbound.protection.outlook.com) ([65.55.88.207]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA; 08 Aug 2016 18:23:10 +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=gpyFiyhbLHNU+OxhbNI70xWfABjvksObY3fVsA38sDM=; b=JV4B6lhAeJCdTHLbu1XM6ZRMffeyAiJBeQ/V+JQYsEGtaB4yvUx8MmkAqAh/6pvW4aBkkTV9U2NyrVo4yL0KuXTOjMB7Nvwel/PnPlmH0UCmJ0Mylq29znVn2Sv9BtqbI3skpajkZUoXwFLdO60OPA5l2gUV+e2epqH/XequnRs= 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 HK2PR0601MB1442.apcprd06.prod.outlook.com (10.165.182.148) 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:23:07 +0000 Message-ID: <87bn1339ln.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 115/159] ASoC: codec duplicated callback function goes to component on rt5659 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:23:07 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: TY1PR01CA0013.jpnprd01.prod.outlook.com (10.161.131.151) To HK2PR0601MB1442.apcprd06.prod.outlook.com (10.165.182.148) X-MS-Office365-Filtering-Correlation-Id: 4dca72df-12ef-4b27-9261-08d3bf6d9bd3 X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1442; 2:CWMIE8SW4ArhG/GkP7gRLGFPrrdix1TcluutyDBDjmzT7Kw6NGwSUYFX06/laJkOQ2XNgdJk5Ze/ieZWNOFLQVTXA04BtEGKvKpWwAK8n3skjGO3jfg8NS1qdrPOpq6KGnGsl2xogZrWuIui51aCHwJhx+vAiqIiPp201msv0X9WFI0FwQc+F5vbEroPWq5j; 3:Yu2KRWPmaH8jOfDNx+XX9V5plVqhkWRHFtaGnApqEyxmuIxyPECz6UhM2GygA9ERz5Dac16Co3cC5Ye++yH39wcEmf4p/of3CEApp9VeEXowHnsXgJ4MQtB63ykGsYWM; 25:abERmQVKkc5O0VIvxQknPxDXtAHWm9mTdJ4t3oInFb7KHUVfatjEXDZUU3KiKnwFGlcG2P9VOxG6vdTpXm/9FsnEQy1i9PA+aJFl2dTAGjZAfm2QzKcBadoCW+dYT4zrf4KWpDg5LBRkSuTbUnb/35Ll0nrdcueEN6eUuwBg0s6daleL4BfeSUm/1jz7luS+k5/KeFfiPt9TxxP3fMo0RgWae9AoB82SgNLFEkCtXMztiLUPKy92v6JWA2tA+mGckyRJMUKKY6mM7p3FNBxJY0SwuOpiSjITtlkCMyrTTnuUd3ju/7rgoWNyQm9KdIYNA4/tl2VdzuEx0RbJNe2rfGWRSayPJN5Ory7JCFo1GyJQN6cU0K1JvCfEfd7BAg89JZFhMvC5LV3UBPCevmYH04SAFW67C374vQULy/KVj38= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:HK2PR0601MB1442; X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1442; 31:FDwu5dCBDQDdLzjR1CzMK9+YuALeVVooSfFtS2F7Nz1y0JZfcX/iS5ppLHEN/XPuhZWDfnNWMq/Y+ThNZ8PZx8+Xl28+EWeYw/U4KcQq9kUJ7mF8KS0+ruKRzunarHWMesHCdfq0mW0+m069XLgk9PuVLs9TA2ulLFw5QN1mn4v9bVCWNG6BPDrSnILni26Hs7ghQBUzeSK2SUuq9M5agZ0aYgytdeA2b+sw+WmVMqY=; 20:5wWz9MnF5LuLFTkKYfEpRnpxGyQMtlTtRG70Dqi9HzIrOvhldr2qeUF5B/YXw2Oy7Stew9DNixfqo8XAkTFZYbRgRi1JFXMV4CVm6/7fvM0bdtgCf8t3uhKrwArXHIvmvjigyrLL3uPNkpKTuUclvqKIhfmLAzhPmiAIc1k3RZZq4M8FnJaUdGRG5HU19V5vdLA6ubdyw4bNPWi9zV4WD19qJkcUmqDZ8DjHSYh29I4UgVRlxZanLw6d9727gNiF11OMo7zPl3wdXHlwBT1gZ+hDj6W1Sr0VQQ7G/7hObSkNzF302l0CXKeH9Tr0x1znkRw4HcXEjXqfrzEwdWbAmabiE9FKWlH/0RNlbIZrsVn9ajedV73HTFRFC2aBRKOiB71ee9EdDXxv2Dfa2gmQxPp3umH9W0Vijmx+D/yuON2VRXNca9beBV+zgIOod1WmIerC6zaiEONAcSoJooi/p4guAIjNVwS0sHoKfbhBsKUQ88d9Pk3w3vuuKRdzLElg 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:HK2PR0601MB1442; BCL:0; PCL:0; RULEID:; SRVR:HK2PR0601MB1442; X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1442; 4:Arf7ZTS7WDu5yMyzUSPr2WVMyx1o4LV763vAWLPEGGuXxr4W7pClWr7NQpSIV9vbChRIqMBiM/xNdtFwfTcCqintuHQ3F8nkkUB6YEkKoAKx6NYrRQvQd4yPytZRb8iTIP9EkfTBSoY3j4g6IY32EBTJx+03YQFGV0OrYI65v+3W1ZWuNDY4IqWXBx3RpXqx6LJ55ESoBz5UdvXqLlZLMe28yrIsgeUJpQgA02+BizzMV57zqRG7ka++c9rVVzYRlqKbk8LeHM2IZXt426A7Oz9pviAZp0drv6lNf2EksmETD9JMIw7mWqXZX1zf8Rn+QEUM3fwqFFAFRVPS3pJ/HO/h09V5ONpbwooqzCv6hYH42feqaqrPkriVIQ1A9OXkQxF7JHmvCneKahUjs7hcNA== X-Forefront-PRVS: 00286C0CA6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(189002)(199003)(66066001)(8676002)(33646002)(189998001)(106356001)(6116002)(101416001)(105586002)(2950100001)(81156014)(68736007)(81166006)(23726003)(36756003)(586003)(3846002)(50466002)(47776003)(229853001)(110136002)(97736004)(54356999)(19580395003)(7736002)(575784001)(46406003)(4001350100001)(76176999)(7846002)(69596002)(2906002)(83506001)(305945005)(86362001)(92566002)(77096005)(50986999)(42186005)(19580405001)(53416004)(4326007)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:HK2PR0601MB1442; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; HK2PR0601MB1442; 23:d1etifUjJD0vPU8c/s0o0ipVHT9Drsrrn50OcUM?= =?us-ascii?Q?yiVBmheOxPU1swuTxGdcYBU5t5hBGo1T+30gI0Thub3UaBD3czdB+jb3xba+?= =?us-ascii?Q?gttvk4J2JkN5xOAVxOg96oUXn3Qyf9IccLHIlFYjZW6D8W3FcHmZeyCOWL0Y?= =?us-ascii?Q?r31stnbvxrSshfMaZyx5ZBNwaIarPrZdS+xCEFNUeIPmSx8pr6V0Kykz7OS6?= =?us-ascii?Q?Bc6DQO2POx/DX9Ot1G9wk05n2YlEpj9h4tjYe0IDh+bAfsKnxVkMT8Is7VWG?= =?us-ascii?Q?rbN9NKsDTB6duANrAIbaEesw8wLdqf/9DGPHc4zdeQNnlJMcCtGn4aScNgBM?= =?us-ascii?Q?0lvGlJheUVTycHXiMR613P5P1WAQQg7FXdVCCWRLofrdQimFNQlu5mGCJvzf?= =?us-ascii?Q?aGwoqQdvKzcI25TEeAoIybkBk8JPfxTHc5Dtw2p6I25EfdT3/39o0eqQD2Nd?= =?us-ascii?Q?ggDg58j98e/Qdqr9kZ4GMrxOEqgavarHAGLxAjoTqblDwPfsEqcvYRfp42zS?= =?us-ascii?Q?rw6CWX0XY+j73LjTLWHKEgcI/OLkQoGBJHUuYjEocdUwLyCD7XsD6wbMYuEH?= =?us-ascii?Q?acijJ1UlajlhfbaSy2uGlydbJBzU5GjpxNhg/vMBEk9N6MH9mrmC6f21N6kn?= =?us-ascii?Q?shJEFOx9UaMOThNTMcSeHkOqrMyk+05G+bAsgo3F5d1I6uTPRdrSOpM1xlet?= =?us-ascii?Q?yWz+XEIPAe8iu01DJivozB7rq/3kOQS7pl6p6UADihpX4UTBPeyaSrtS3o2K?= =?us-ascii?Q?HMSFsWypsTJNyZdbAZBBBBv42R9FZVeF9IpFZuGCAiifPXI3q5hwbF1bPIun?= =?us-ascii?Q?Kt3bkE2GwpoPEMI8Ch1O6vx2bgF7/3dAF7EtCp6T1xR8/u0nPnoQweEt1BHF?= =?us-ascii?Q?lRGwcMFz0E3toTt5RVVUoYtlZa5wI0s+dAtssGA9mAWAFf1cjymzcZhpdRCd?= =?us-ascii?Q?+4o7r5AFILSww0cUNqWabA7i7lu2XRDF8yvjs0xngoVVY0xDdSPigrQv+gLn?= =?us-ascii?Q?XfcmanfqlgB8qJ7HSxiEj8i+jsqRLeDj4MVH6p0rd71gjABPmM0DuE/99ZqT?= =?us-ascii?Q?3hM+KjoVQAE/yJcml8TKyaMF3cB5AHjtmkmOLmDOkUz8jzYc7Hlkhg0A5l5w?= =?us-ascii?Q?H5WwcYDnBbIhzJZwpzmF0UUxN6SPoHOS0LHstblkGzG+oi/Ikk+Ls2wLAJ0n?= =?us-ascii?Q?T5Q6PQB2zUwvosh4=3D?= X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1442; 6:eMsMOcPe3bSO9wFvpZM6Tmptrm/yPO7J//Jq6HCNrUBmi0f0NjsVu8cSplEGnrTTyHYHJ1N+/lPlBKt0FQi/o9L5G59lOilEysWYqzThWfDc6jXeEGgnnx1V/ysjdICz2lzy3cyU+CwBZ0WZn3OCJlkyK05ZeByAg85Y+mdJ/is1k65n8cglX3lUQ1tXhtvQJy2Zq7byoQ/lZph/TdmxhyWKZ80yqdqE3aYiIAxCkxIVTqHnPidskU+0bei1kxLtHYJvkJXeBl1TRvjosbmAISok73y/aWOIDyfleMYPuVhDJvwr8MBfK6t5GaIRj6j/J0eiRODK04IGpRQVKCGJGw==; 5:9floXdLhCsCJp+BLV7d8eyhtcw16Id6ImHs0IIXCVO3iA208Blc+Jj6KlSqfDUTOQQf2aB5z2Et4AjjG0PwUFjw+5Tt7hmiTzKLavcmByPoKRMYTLsLpz8xEbcw7WQHSzM/xkdDa6PdAH8bkMWpjkg==; 24:GmrCoMWwbzSfsonj7Rb6KPFaKik3DUbCBEUFc/i03Xhg03AqFcqZB5y+aGKzrBisSdu3DePt5WoZHhQEOUXY9ahCZ65E4/rsfOiAtFJxEsw=; 7:PywH/rJWWpnxmrrCN72zPOOX4/W+ckRVwPg9GKsBclDlWGyDXAsvZUSr7rnxyKvHzakCnrLAtXbKBmiYjxAGTXUxv5L/B/npQIWEWAGlKMfuOx8bpdiqN2V/SViE4xu/wPbveB8i/ajPaZjGTlspv3qBLQ07B9uFIt5+Afp2qToHX77O4eDYIMG0aLDgpkzGajl2lryoG1HqhxBaMvlVEWe15sEUE06uq3L0mEnhf8TdAOMcJLlIzyaJxGaFthUB SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1442; 20:XgF1/Uvl+t4gxn/YYfg6TnUxtVec/D48ps2v+aBpmZNH/BBUEKVURdX09mO22TFdCFwZk0wNx2AFZg8/fhTevoYyDchv9eiDM5mzGM8dFz2L68P/rW9j54WNYLv0DVoPx/ekgybiPemANEEK3C60yFH+6fpAnHpdrcQGvQEBFss= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2016 09:23:07.1642 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: HK2PR0601MB1442 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/rt5659.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/rt5659.c b/sound/soc/codecs/rt5659.c index 42c183f..4c0d2b8 100644 --- a/sound/soc/codecs/rt5659.c +++ b/sound/soc/codecs/rt5659.c @@ -3737,12 +3737,14 @@ static struct snd_soc_codec_driver soc_codec_dev_rt5659 = { .resume = rt5659_resume, .set_bias_level = rt5659_set_bias_level, .idle_bias_off = true, - .controls = rt5659_snd_controls, - .num_controls = ARRAY_SIZE(rt5659_snd_controls), - .dapm_widgets = rt5659_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(rt5659_dapm_widgets), - .dapm_routes = rt5659_dapm_routes, - .num_dapm_routes = ARRAY_SIZE(rt5659_dapm_routes), + .component_driver = { + .controls = rt5659_snd_controls, + .num_controls = ARRAY_SIZE(rt5659_snd_controls), + .dapm_widgets = rt5659_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(rt5659_dapm_widgets), + .dapm_routes = rt5659_dapm_routes, + .num_dapm_routes = ARRAY_SIZE(rt5659_dapm_routes), + }, };