From patchwork Mon Aug 8 09:15:10 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9267253 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 7C56160754 for ; Mon, 8 Aug 2016 09:15:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6C52527D64 for ; Mon, 8 Aug 2016 09:15:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 606A427F8F; Mon, 8 Aug 2016 09:15:17 +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 D221427D64 for ; Mon, 8 Aug 2016 09:15:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752007AbcHHJPQ (ORCPT ); Mon, 8 Aug 2016 05:15:16 -0400 Received: from relmlor3.renesas.com ([210.160.252.173]:43743 "EHLO relmlie2.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751951AbcHHJPP (ORCPT ); Mon, 8 Aug 2016 05:15:15 -0400 Received: from unknown (HELO relmlir4.idc.renesas.com) ([10.200.68.154]) by relmlie2.idc.renesas.com with ESMTP; 08 Aug 2016 18:15:13 +0900 Received: from relmlac1.idc.renesas.com (relmlac1.idc.renesas.com [10.200.69.21]) by relmlir4.idc.renesas.com (Postfix) with ESMTP id EB1705937F; Mon, 8 Aug 2016 18:15:13 +0900 (JST) Received: by relmlac1.idc.renesas.com (Postfix, from userid 0) id E54E08002E; Mon, 8 Aug 2016 18:15:13 +0900 (JST) Received: from relmlac1.idc.renesas.com (localhost [127.0.0.1]) by relmlac1.idc.renesas.com (Postfix) with ESMTP id DD91C8002D; Mon, 8 Aug 2016 18:15:13 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac1.idc.renesas.com with ESMTP id UBE09998; Mon, 8 Aug 2016 18:15:13 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'";a="217447008" Received: from mail-pu1apc01lp0017.outbound.protection.outlook.com (HELO APC01-PU1-obe.outbound.protection.outlook.com) ([65.55.88.17]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA; 08 Aug 2016 18:15:13 +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=YJgQ6cdXnW8ibZt+/OObE2eN5ZtK85vVyDD9QE+rSsE=; b=e/DDyFKnNDAU9cKGMFZhXBgJMo1uC/8sJ3d7FeS9Wb9j/uZfK0Kv+UEvzoyIaQ9lKoZk3iXefXyFRp7mVTD+iiX2W9smg+5tz9R1tDFFPhhxa8w+nvNAk8K+weYOuCf09g/1EpcEnBX75symqO4r1fr1qgLamC/7AFPy10FqOIs= 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 HK2PR0601MB1441.apcprd06.prod.outlook.com (10.165.182.147) 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:15:10 +0000 Message-ID: <87d1lj4ojd.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 089/159] ASoC: codec duplicated callback function goes to component on da7218 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:15:10 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: OSXPR01CA0006.jpnprd01.prod.outlook.com (10.167.143.176) To HK2PR0601MB1441.apcprd06.prod.outlook.com (10.165.182.147) X-MS-Office365-Filtering-Correlation-Id: b79e2435-0089-4fe3-d3ae-08d3bf6c7fce X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1441; 2:r6pEpFkqD42dWjHepOJ3N61Trcjyt54H1uNzWyGdAHFuivQs12pmdoSCVe50sQjpq8D2/DWi82s1hdpVawgdpIh+kLbGCV+gfH2PBZxjRbWuPPqIRh40mg/vq3kXbaASf9SplGXHM5bE3ymzxC03w5NJE5oXOLRVGkwb9+mYw293qEsS3NgvFbwRLKW9DM+d; 3:IWy2l8x7jSZI7tvj+yWiMpnSiUp2Je9Dlh7748cfrf/rmNxRd+AAnLbZ2A8cESHGR71lldtzbuvkwasCswITt36jTSEUNzxuWVQHXO4xfY8UjaqcVGuyfhSXnjwJB+j6 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:HK2PR0601MB1441; X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1441; 25:DHdpWZYLPDnjKQ8hqIynlmniwQXbUnLzMATGRU4uMcyXEqMGlR5Ya95fL0LvG9hrj/rt4TNVIVuR8bQjlU+bfMbgBs2y9cB5tbDKpsRibS/4lt84nSDG4lyJtA20CQhA31ym4VzWNOPEiu91z/NzMfpcUb/refwsXTaQzFoiTUQrO2RFgWbGqOXo4Be5YV7tPPnMMuIZC/CDSpLku+bLSjI2b9eKCTLIieaxoD3E6SpnltpaWNwSPtC2+7iUJm732mJrssW7YTQGit6Vo5V885AXJ1NU1CXHLzrpxkaPH0QWgvBEhUXD8vCELhD+Qkw6XzYXqaiQ7tcfgGZMFFLdIuXT18L0/QHesVVFJdzknjVtjEpXyNh7/t2uwVx8wzaG0DwhVzRyUrIXTv/fzZexV5Hgyk4+7IY6W9Lpbs8ozHX8vAmi32U6NnpC8lxCZ/twiREwQ5KW5P+A6b9A8cfKZbjk13rRK7E/RdzB5ujp7E8STsI7FRE50Wga3ZUufLvYjH87sPBFRJwy1HIA3ErK7v3VlcA8f8bgnrcujZi3+Yq0Fev0ixcqve8pHDxIhR/0ba5tT13hGHiOF2L4D3WLt40FsmrvnbUs7cAuD9DDR00+JoG1/h/nhpJU1IkqLv3kYtMn2EJ4Kv7RzQ/WieleUoiPmyGygJ57Clti23m8JcNLJ+Vbyjz228NG/MSf+dAu; 31:2pXhEI8MdtNN96Hf86h2rmCgzVsrkon+WbeyBoB8Tf332W68iJHCUr0xkgKVKy5AGJ8mSIjwn5A/wc064+9aoXWkcBuPL0UoPfjVimm6Si/0nv3w9fvKhReTkRJqyF/sz11UGO9faYDJ+mVLzZMe6jhl4bhky0VzndbFtCUbZcmTPCi649j7gEd743eD4M9Sw4a/qedYjcibb+nWpdDj3RpKjz3eD+zEA8f 6CgWN2LU= X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1441; 20:WIOXEzpfraajdwZzAI5X26lVj9RZZ7ypxtb9/dKUYMYwabLSkfnZLKCQUTMFQBM9Xh8PIuedUd8pZFB6qnTt/ZOFLpYlFIh0PKMePUZG34yaM9OfLpFAM+QbOiJ1Hmn+dSlN1uF2Nw315QXsy10xZ/j6OjGZdYk3V+siqtSDps0prQsRsrhRzSADlivReSUapCG0UIQ+dy56f6VK4mC5s2g3GjaWYe3IOmXm855Im9eFoSsTFdc3bxPBlQcOlQ05XsI/QrOpFzJTrYqJDlkrHLcXC29UHkr94ZHHRrNH1t6b1uQzK1jq6YAONieHmokcyA1by4wqgXOy/jCSh7j4OxuLSS0j0yicMice+7L2Oy+QLqy2qKGpWXSPSenKH5Va1l+G+3GZ5ZaBGZLd08K7HM0pkl6QycWHTgeODKVQrmMUdIq2mEnJcgxvD5GVuBxietRIzA2/+JKQIf8OfgVgf5tHqlbquDB2m4Xlk/f+nRfpFvVdGCWyZKYX/xmgMqN7; 4:CNA9VHOalJNRpM0PnYTr/w1JqvDaBextKzFnG3z7hdkPtKOyoNkL3l+efriE+WzXzfgkZalXNBVodwMT9KDyFy9NciGWEiP/pWC0ioU1ioZ10LNdMmwGiWupz3Bix/CgHLiBybVQOWU0UQ8t+PWcT2fQ/p8ykae29S0Q10l8VsGpt4rGN2g/SgxaR73WHLMcyDwH3VFtKZsn/Ay4H88zWvz6hYAd2STnOHdT+0wTEPDFChuYDcpEnsVavkqOoSTJWUOJI6k4jnDEX1UlEcNDg6iEQoqTu+0WPQzihUYIDY0TR7l4mGnXQqT00C+SQ0Jf8ByEN7eGD33oxN++FWdVnKdm2zdkO4PUXOi+P6V4CpHNW7yusyO/hZBFurrfBbXLU9uEe7FroeCXzbJ0Fmtg/Q== 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:HK2PR0601MB1441; BCL:0; PCL:0; RULEID:; SRVR:HK2PR0601MB1441; X-Forefront-PRVS: 00286C0CA6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(199003)(189002)(68736007)(2906002)(46406003)(4326007)(33646002)(586003)(92566002)(86362001)(23726003)(36756003)(6116002)(101416001)(3846002)(7846002)(305945005)(97736004)(53416004)(110136002)(229853001)(4001350100001)(76176999)(105586002)(189998001)(54356999)(50986999)(42186005)(50466002)(19580395003)(47776003)(81156014)(19580405001)(69596002)(2950100001)(106356001)(83506001)(8676002)(66066001)(81166006)(77096005)(7736002)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:HK2PR0601MB1441; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; HK2PR0601MB1441; 23:8AgdC1MvMqmGSmSyyhq6lzOwg2neKqjtLp6JJkw?= =?us-ascii?Q?DmH6nU6FCKM3LrAuG9zp3MJ8vWVqJxFxaanJX5ytPCXpGNwtUoV206veaPZA?= =?us-ascii?Q?poM6n5ECfutqSn8ENawMt+DN56jyEYJt5xogtlx2/Z8Nv/urMdV1Jf0vIw9b?= =?us-ascii?Q?W1s6bVqRD7OJrZGdy5TMfsJGWaM80UMTsr147/GyNNApRil0BHttwHQAMREu?= =?us-ascii?Q?i/9fYYYJlNIRynI2/get4IGnkvLyaAUfUQR7tguebI0/oa/PSSPUUwdjkpaY?= =?us-ascii?Q?FaFJyYeiHyGuhX+sUIQ5yctBe8iL5S7S2yTya83CJQjKQBqHt62jaBR4j6mF?= =?us-ascii?Q?RiFXFQc8lkEUPBOfFIIpyGvaRtOEvFJkWwkzTFYmyY3p5+4jjEr0QJTxSTYD?= =?us-ascii?Q?cpClCC7mPSfYrXA3BGleu2xmYBRJtlAMYJr32lPMgK55eO620Wu2evfYBFzx?= =?us-ascii?Q?qQWchzPUVsPaE/esc/FbyrSB+9E7wIpII5UkCo+Mf7d7R3GB6gOgoWq/fwbv?= =?us-ascii?Q?kbJBxciM8JhmxFEE0G/DNby8C4PgfpAOYuod0dgP/X4py7h1jCNYLiueitmO?= =?us-ascii?Q?0Ago9lGFqWi6WpJFNZ5P0Z2TshGoEbTXP4es4z/MEDUGDaFLwTAzvx9weNTM?= =?us-ascii?Q?tJT+nhi/pMULMr7xtfpoDCuvBSTH5WBGD5fafOInf2kfoRHgVtZchS0PtQh7?= =?us-ascii?Q?Aw5Wlb0midERHRFHvx7Y71RvQ66fc0O1HE+KA5oezABEOY71sgKuC+M+jBgK?= =?us-ascii?Q?UztfOtirBweB5jKLtK4pYRMNDWpG6o8/o7xpieQsceld7AY0MgQ7sJ8AYr8i?= =?us-ascii?Q?leEgaUuVKkpxBEHB/d77tG/6kNF6SQn0Y7bzabUQo1e8/1xZcSUeTqJavNu6?= =?us-ascii?Q?vqP0mgBLyaBXuiQBLqySXrPYFxdQOXw+Epug+t5HR5eZ9ILwQ0pSR71uWZ8M?= =?us-ascii?Q?7hVRQuX1M3I4c1AqTpZ+h4DMGxXVCHQAMLMmaVvHRk3BuKc2GL4mTZmetoPu?= =?us-ascii?Q?tzejQr20bADNjPXsfDK5O86sEjVPXSqdSvSsQv0TWsYrLnvZ+saw9NkijHrW?= =?us-ascii?Q?iElpwjwOSuxZ1qQe3tVLIC+CAeyKukj1fEvEMR0a3CO+YcdxGwOi48QUC7U5?= =?us-ascii?Q?q8RHWxQiSdPTI/zDnDCb08SuKxi4xjXUjW0BYINk/VqBRimme7TZ44A=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1441; 6:at4gjN1CSeEg35kZPm97/qzb1r5uhiohSCAiC6eLx8GkI1N59eyV/I9JKa4eAT09PHQdTE/M/t0Sv7wxLBgPrkgSBOlhxsr1OxpskqkLxymk/Rlf2eaUHM7bhLGwhfxFnTzQxiXXSEu+Fv3REbK6PTjI6U+70FFzRQ+rXXpdgAiiruA3X2wpKsphr47HHzjo74mFafjeeJnyyiP5runXEG9/ZP5WtbtDDFzAlw1jyZnwGVHEYjzqPWHgMj1Ro0QPwB+uKGUKFZjmBKfUd599ccZf5PbQ+21E2P/YIhY/Y6n4rhEl75xsrF44/KtGHlOPFUohkq/Y6TDZRYYOSw8Y2Q==; 5:d8RIZ5O3OIeUFgyjduWlEznLp9DEqYbkkYR6LY99TrSVrBRWQaXwJvuN5OfT79nsOFiljRZq2os3lITZnBTg8mwRvhTh+mleaTYM/duKzR0PuUe4QMG2tvCRpJgJs7QCSOMTELyFNFwNLxQiQT+ueA==; 24:CtLTlZVoK0WQxW8/l21MMzqm45SATLiv7MwHwqc9WWOQnNNkJwwfH3sZHjZCs8JgfhGDXswY0guS9rriJhxHYT52Ql4DJFglgW06Vbalc0o=; 7:mbQVZY6t7gI3vxqFNLTIAfulmQ9sKNk4zYWgmg87rPx/XbStwlpFZfpXQ6xmjI+ZWBFousIbdLAMZEfU8onTMzLaZaDZa+eRZcCo5QhcfHw8se4C9Cz5mmD9/DJFZ5vUnrxjH4gjtTf5IQd50LtCI5PIStA1T/cWtDiodp16HsE93Nq0zufX561PCzco0AFXS3PMUhzIhXngLNafiGqhNh6A78eoO0+5030gusFcbSahIiYcQumuskwLpxm1zrBz SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1441; 20:g968Qjikh1WMAQzrfsVG6LQW84GbbvbDZQmlH5by1XjxHckL85EDnfvQZfa2QTTUZqLF5Z/us2Igs6aASyyN6ZmRsxrSskgdvya2hcdCuoUFuanmUW61aKvPAYYGZ5W9Snfq8bTOBK96ZCX8qrqDAwvqJqOHAW03DY/Z5xLG/mw= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2016 09:15:10.5601 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: HK2PR0601MB1441 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/da7218.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/sound/soc/codecs/da7218.c b/sound/soc/codecs/da7218.c index 99ce23e..dcdda6c 100644 --- a/sound/soc/codecs/da7218.c +++ b/sound/soc/codecs/da7218.c @@ -3045,13 +3045,14 @@ static struct snd_soc_codec_driver soc_codec_dev_da7218 = { .resume = da7218_resume, .set_bias_level = da7218_set_bias_level, - .controls = da7218_snd_controls, - .num_controls = ARRAY_SIZE(da7218_snd_controls), - - .dapm_widgets = da7218_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(da7218_dapm_widgets), - .dapm_routes = da7218_audio_map, - .num_dapm_routes = ARRAY_SIZE(da7218_audio_map), + .component_driver = { + .controls = da7218_snd_controls, + .num_controls = ARRAY_SIZE(da7218_snd_controls), + .dapm_widgets = da7218_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(da7218_dapm_widgets), + .dapm_routes = da7218_audio_map, + .num_dapm_routes = ARRAY_SIZE(da7218_audio_map), + }, };