From patchwork Mon Aug 8 09:34: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: 9267513 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 64695607D6 for ; Mon, 8 Aug 2016 09:34:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 53A7626D17 for ; Mon, 8 Aug 2016 09:34:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 45EFE25223; Mon, 8 Aug 2016 09:34: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 D45E925223 for ; Mon, 8 Aug 2016 09:34:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751951AbcHHJeN (ORCPT ); Mon, 8 Aug 2016 05:34:13 -0400 Received: from relmlor2.renesas.com ([210.160.252.172]:16833 "EHLO relmlie1.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751259AbcHHJeM (ORCPT ); Mon, 8 Aug 2016 05:34:12 -0400 Received: from unknown (HELO relmlir3.idc.renesas.com) ([10.200.68.153]) by relmlie1.idc.renesas.com with ESMTP; 08 Aug 2016 18:34:11 +0900 Received: from relmlac2.idc.renesas.com (relmlac2.idc.renesas.com [10.200.69.22]) by relmlir3.idc.renesas.com (Postfix) with ESMTP id 42F9F52A22; Mon, 8 Aug 2016 18:34:11 +0900 (JST) Received: by relmlac2.idc.renesas.com (Postfix, from userid 0) id 3374E2806E; Mon, 8 Aug 2016 18:34:11 +0900 (JST) Received: from relmlac2.idc.renesas.com (localhost [127.0.0.1]) by relmlac2.idc.renesas.com (Postfix) with ESMTP id 2DB5F2806D; Mon, 8 Aug 2016 18:34:11 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac2.idc.renesas.com with ESMTP id UAF21969; Mon, 8 Aug 2016 18:34:11 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'208";a="217448518" Received: from mail-hk2apc01lp0212.outbound.protection.outlook.com (HELO APC01-HK2-obe.outbound.protection.outlook.com) ([65.55.88.212]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA; 08 Aug 2016 18:34: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=3FacUWF4RmG1KVDr2X5MaX28YUPh6pINIWiSy82ud+E=; b=I4FU6QUjvXRD3ipyz44vP0kXcjOg8XsGD5OXq1m2jnr7OLRrLI1J+BjMOLjOT6O9YjGgxfzWe7hMNdBT2eDtwUHch36W23hYFdSP+KVsH/NAnQk7nchVmp8RTPUvIhQAqlCWxfvBELwWu2FHTGnmP8Brxe8LeRRJN0f0pw1+wso= 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:34:07 +0000 Message-ID: <87vazbzk5l.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 151/159] ASoC: codec duplicated callback function goes to component on wm8995 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:34:07 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: OSXPR01CA0014.jpnprd01.prod.outlook.com (10.167.143.150) To SG2PR0601MB1453.apcprd06.prod.outlook.com (10.169.106.19) X-MS-Office365-Filtering-Correlation-Id: 9ac58683-678b-4e12-b7a4-08d3bf6f25a8 X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1453; 2:ykkBOvfnNuYOeHtSBztxEENKcKD0INoRBUN9NDIPMbZ98g9neKceh+3mChJPAhUm0WiyW8ZNV5JgsEQXwOgoN/AEn0/O9y9BGYHkjDdzYAfmGw7py+MnNja/xUISXwRQQKHV+EVjoJNr+Iakm1BAQ3fXtYXRVb0GvRLZ5ogocIMRLHLnQBZsMGfENG3EjZ4n; 3:fh4WGjpJO1KNEafvcsev5XbNfyYMmmmTeP6tPPSXMAQRmPmdLn4rdUMa1KYBzIcUxTQkfznW/ejeBkzx39Q4m7fEiQBKgGOQ7Rh4c2XWxbxDXspX7BvMeWMe9Jxz/vmk; 25:zYUWUp6CAJbovrpV5x/wz21Cv/0Zk33o8BbZU+sLzZqvQEQK8exo/aEFIPitulg6/qiZ334dTBZoLUt32i5I/oFarK7T6QzulDqbgEZTdyb5yMXb/pwuXrdu/yXeNMuBDmzSMYo7H7fUp0s6pV1KiweCPepqkeFuSDBWWSmBp4YWWZ8IFNz77T/SWLlu/R0E7RsYqFveIWX9gXXl/Ts0QETW5b1L5XBQK+PHd++r2kNB1DRnnZQJZtd7ua7PmN7VaO+nm3Mt1nFwzaZ1i8hcOsK+pJg2P6WW9aBQmel5VbqhKNY68fRB8CPDSBW2FvA+vdSCc46f+STiOLm+aIItQ+R4yFfwZkgGg0YM0K++sx4agTxXwY7TWDaQZzqS1KU4NPG+jAFQfAioiuf62T7x36aUQZP4iJMny9Fr4NkcrM4= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SG2PR0601MB1453; X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1453; 31:DfEGxCkTVdgYAZ5YTCB6f6o599c1jgmw4G/0rE3vY9Av7n6He6XHWO8tDhJcQpceY2j58wctaYTVsqkHoEt8GsFetzG9WOnzMb+tXboIFlzP727DoqVfeRYO91tOJR457YQDGzAacyCJVxwsMnSSkbZ69HClHqBnjeCrpW+xiNDgreMXOeL4OxfVEFAO1l0pVCtSvyhJNsVM8b3T79/lheIBd8Zvtp1aKEv8m26YVKI=; 20:ky2Rab37+SBuFO+cD4CLk3osR1wzZUhrb6jgOx7Jg10KpML2HgLB0j/CU06ZWXw3AQLLPfdNO/pxJo1F8XRMQU4CxoKfri8kpn2tNr3uZoIh/KwRqqhJR8N5AiXF+ttk1cBb0aJWU7zjwNwl4ET04hz4Oe0rjEgSjkEKF5RR2fMeu7G4GxMpv26+AzzR6T1mpuVPI01fOJa88xZxjDhrYEQE8nrXPg3bfezoDEjgONC+JuC2cx9dB87R8W8M1ME+opgK0NDmas0qMhEt8cYSEQBvXE4kNnRD2fTFhgjLMgD8J1O2a5EyA/ELWEtKmuWLpjY3+zs4JLhgfWQSLQurAdNAQMvLV5W5HlYAKt1+UJt2qqY5uR1+5M6JtUeKbp5RoGohzU1pj2BLpkU2za3nYDGieAwHVQieOZqEtqNShccoQpx6hwDckTaRqxRZiO+7MsvHTZeTveyL1d1zS1x45l0FiQA1iNRU+VB7XHfm70qBUrScjcpJcE+BQWCKUEQG 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:IYl8Y1ZQ7L0xa2bkvF+mARvxfIugTcSTRkPX6psm/J5LKxkVUydiI6pqwISuvAxysah1Z6AWzp2rCaR7WqWrqLOmU3mMxFNoXvOxNaGt48D6FhjuvGCzDusWrkd0NkKhrRSdmSTyBDap1U7WdZRUonC53cyH7q3GuobU/kw4PkwBrbTzzGAogdcT+DIiq6v4lohTD578ouhgdyKSBT0781v2BRiMo7RKzDh1rsQ9vC4G66mUL/dLxuCrD1bQ+y9ZHsxniM2vjVnjfTj1aSo04Al+iv+ZVB7Hlyr5t6WpY4lR050704eaUXtRmtS3AAMLEwpgOYzYEHvsYZSKqeCwBbJut1LiH/PFfEwn6C6RGA776OQlV/USjW9ELHR3FrlYF5F/1eaLOorfGySyulDPUw== X-Forefront-PRVS: 00286C0CA6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(199003)(189002)(586003)(105586002)(86362001)(7846002)(2950100001)(68736007)(47776003)(97736004)(305945005)(4001350100001)(7736002)(66066001)(36756003)(110136002)(3846002)(92566002)(189998001)(76176999)(54356999)(50986999)(53416004)(8676002)(33646002)(46406003)(69596002)(101416001)(50466002)(19580405001)(83506001)(19580395003)(81156014)(81166006)(23726003)(77096005)(4326007)(42186005)(106356001)(229853001)(6116002)(2906002)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:SG2PR0601MB1453; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SG2PR0601MB1453; 23:TwWr+xA9PcCFYMrrY49nGTIM3c/XejPAxf3KGVu?= =?us-ascii?Q?01OtFCrWVNEnZGmtwAaRe1t/WE+j0ciyNzPXOtOQc4mHI1Q++wG+S7N+hF+c?= =?us-ascii?Q?1uhjVfdzoviewNaqDpgHIQnf0SnqO055gtWWwNCMu+uroN8CyZHGUFqJXd8k?= =?us-ascii?Q?eT9Yditpr4/GZ/Hjr2Ez7frskY91abXs2cox/QTsl+DkTrrKVNe0EhkDXhPy?= =?us-ascii?Q?Q6HNxEIk/Gr+loUrfw0GLFrL797KTIzXWJBgTmuHvKxEJ33VJp0xLIUCJGlm?= =?us-ascii?Q?O4IiTZSdfNBAXItMHdK5AoVA5vVqBhwFN5X0KMx2dRTo8LaAhySwXcHa+fBQ?= =?us-ascii?Q?gWlKimjDbnxs/IO3yGS1n7NqIxupE9/2eFsJvMD7Dngsg8t7WPIU6S4VRkWs?= =?us-ascii?Q?Fv40hFqTOhfbsAt3d2swIAcj9Jso5sMwEexYE8cm1S5LxGl1ZITYtNFxCaji?= =?us-ascii?Q?V4wU3XXjkWN/U6BV6FyvnvjuMmHNQZQE6Kd+9ETlR3yohsu7pZsdJwUcGXjl?= =?us-ascii?Q?QV82wL6y8AbvbUboXV30hwwp+2dqCnpT/Nh0F29YAjjVI8AXTZ5ABX2zBrGm?= =?us-ascii?Q?FJqFKldKLuXVOXCivCqV6EhjJP/os35TqtCtV7gi2DJOywjL9qzta0YHseTg?= =?us-ascii?Q?zh0/ElMubjKIUtA7FmXdydK4rOkwThDoEKkNNH/YFeSCjZemi+1ghtev/Ckb?= =?us-ascii?Q?qXd92CpkkKvBEozDpaL0bHVKI+Uf8yBLNqlS1CvSYu40qJ4co/QmJ/Y0Garo?= =?us-ascii?Q?akp6HVpBnsFruPhKr4x+lN+tVmIkMdAt7da8k0uO9FE5G8jlG3CHpqBMRx5F?= =?us-ascii?Q?frIbUf/7nPnoxPavTaBs1W4uFWOPuNQ3q19nduaMNtZbgUzTPM4vguKVNFhe?= =?us-ascii?Q?FEbMU5l7uhak+5K4kBiJafiraGxZFUF3G2p9r5LZcehfzdRvN/+JMmKoWaYJ?= =?us-ascii?Q?nxzIB1H5JVcQH4dTLq22BcgIyzbUS5rXCVKKCBMSapwz6VVKSMeIOb7X7Ukd?= =?us-ascii?Q?01Z63P3E4O+gv/+0mEh4TxiboHa3YjBnm8ohmVlJLoXrnFhWAWbAa+tavO9G?= =?us-ascii?Q?ehUh35pzCN0OuTsymCZs/1vQD2VWq9PPW+yzjwc+sSMmovNNG8K9fuy6Ab5U?= =?us-ascii?Q?i5is4s/s08heR+uhMfw84SLl8HxQGvEYGPP74aCD3z9RbTNpceCsB4Q=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1453; 6:vKB98VjY8bboafUUYlbPxtgYKiMEb3sdoiRkqACUgruMd7pg3/DfdqrfVvuDUiM9q1daIZZqcSmTTVWgqubjBZpf6ON8tgoc5HE2cOl1svDOmP2vM0UApCpeJQd22qRSDJjB0t0fYkjhVVrGBsPWdrPygE9qDLtuRheGT0UvfLnB6wX4G0FvvmxB7iv2Ku8v9tE3oxbGjTWmEr7t26mdt2Q2K5WlXslf7SKMXExTuxkGgyXoc8j4AE18uQUJf+YRuBs1GA92Q3Sg8R5teMlklEpclXlU1o/d4gmcyDK1FdUBSioOhX0yCMeNvOTcGJQaZ11jrAJyM8VMWEdbtZejOQ==; 5:7EVBJCLaMAdxcqf0dWw8dK2d6xCN3tnGwFnqyAsrSK0O8VzAN8wQH1iafHQNEhcRXMnbIxUAvuHSUXDVgKpQPwnPZ/dc0Lwi3Ja9Nb3x5Z2Ze/UoCS1CB16hUt36H0umcYihU1eCvnfEdZdd5/bjbA==; 24:zOaG6vEq4Z0855+ixrZJXcDa4DQgZSv2Uyq8T8DkF0i8a8V5cOkSGuyFCCWffrt/keL+/+f56z1qzV/tZZ1FP4G317h449vvsyRT/jJoSRw=; 7:fFYjuaCErUsK/LZd9KahCT9xDU6N1XBS5clCSl4Nfry9VwiqXL3/p3LtweFq8roMMFCzmVAoPPYcDfNfh+XnFmyqCDIEFCVdgDgdDnK3Jo5TRrDnS2jzDBFRbzD08hcaPFjhNN0KBilXGf8jCyyEQUbQTZeCuHdhpKwWLx4AFfHjOaqpVw2IniMTeJZyHQTNu3gf9j9yAsADn0lLDAv8bFH4gxfM9RK1eFoV1d7GHemXjOpTAX4PZ30OjJ7Wk7gh SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1453; 20:hg/XYZFDOz8W0tZBVAAXr6w2/KJF/EFaZ86wxlDXHMVr2luSPUDtlfCvkwrPqH2uaf2XNQoS46pq8d3PmM+iZ6kVcFZ2FYLmTiz+J2O8q7kx8H1hTrtZ0oEuC9+aoLlwJShRIdgVsc4NodEMePE4qS3OQU/TvLzRNtPwO3Wg8q0= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2016 09:34:07.6825 (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/wm8995.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/wm8995.c b/sound/soc/codecs/wm8995.c index 24500ba..19b08a5 100644 --- a/sound/soc/codecs/wm8995.c +++ b/sound/soc/codecs/wm8995.c @@ -2192,12 +2192,14 @@ static const struct snd_soc_codec_driver soc_codec_dev_wm8995 = { .set_bias_level = wm8995_set_bias_level, .idle_bias_off = true, - .controls = wm8995_snd_controls, - .num_controls = ARRAY_SIZE(wm8995_snd_controls), - .dapm_widgets = wm8995_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(wm8995_dapm_widgets), - .dapm_routes = wm8995_intercon, - .num_dapm_routes = ARRAY_SIZE(wm8995_intercon), + .component_driver = { + .controls = wm8995_snd_controls, + .num_controls = ARRAY_SIZE(wm8995_snd_controls), + .dapm_widgets = wm8995_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(wm8995_dapm_widgets), + .dapm_routes = wm8995_intercon, + .num_dapm_routes = ARRAY_SIZE(wm8995_intercon), + }, }; static const struct regmap_config wm8995_regmap = {