From patchwork Mon Aug 8 09:34:24 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9267515 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 25FC2607D6 for ; Mon, 8 Aug 2016 09:34:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 14AE525223 for ; Mon, 8 Aug 2016 09:34:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 095C126D17; Mon, 8 Aug 2016 09:34:38 +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 9153325223 for ; Mon, 8 Aug 2016 09:34:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751259AbcHHJeh (ORCPT ); Mon, 8 Aug 2016 05:34:37 -0400 Received: from relmlor1.renesas.com ([210.160.252.171]:59313 "EHLO relmlie4.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751320AbcHHJeg (ORCPT ); Mon, 8 Aug 2016 05:34:36 -0400 Received: from unknown (HELO relmlir1.idc.renesas.com) ([10.200.68.151]) by relmlie4.idc.renesas.com with ESMTP; 08 Aug 2016 18:34:35 +0900 Received: from relmlac3.idc.renesas.com (relmlac3.idc.renesas.com [10.200.69.23]) by relmlir1.idc.renesas.com (Postfix) with ESMTP id 229C251BB8; Mon, 8 Aug 2016 18:34:35 +0900 (JST) Received: by relmlac3.idc.renesas.com (Postfix, from userid 0) id 1217A1806F; Mon, 8 Aug 2016 18:34:34 +0900 (JST) Received: from relmlac3.idc.renesas.com (localhost [127.0.0.1]) by relmlac3.idc.renesas.com (Postfix) with ESMTP id F325C1800A; Mon, 8 Aug 2016 18:34:34 +0900 (JST) Received: from relmlii1.idc.renesas.com [10.200.68.65] by relmlac3.idc.renesas.com with ESMTP id UCA29847; Mon, 8 Aug 2016 18:34:34 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'";a="216938584" Received: from mail-pu1apc01lp0023.outbound.protection.outlook.com (HELO APC01-PU1-obe.outbound.protection.outlook.com) ([65.55.88.23]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA; 08 Aug 2016 18:34:34 +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=qSpoL2+L4q/SlFZSPU12sc7pn08AFIac1anZ05qJ5c8=; b=is/xdpSOQxL8u0bCBmjqykzt7T5AcbHhux1TeGgAyU6VF6R8Gw5dj4zNJ/kp/3Q/X6SVJu6LCkIehIYNB/V0t1TvjpAOC7n32CJyDkGu5hX372KO1fnWerkpm2QbxuJ2aCd3mrgaLR+aG0PWBjcTjMf65QlEFlvCz6YtqYUpeFY= 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 PS1PR0601MB1451.apcprd06.prod.outlook.com (10.165.210.155) 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:24 +0000 Message-ID: <87twevzk53.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 152/159] ASoC: codec duplicated callback function goes to component on wm8996 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:24 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: TY1PR06CA0009.apcprd06.prod.outlook.com (10.164.91.19) To PS1PR0601MB1451.apcprd06.prod.outlook.com (10.165.210.155) X-MS-Office365-Filtering-Correlation-Id: 92180d93-fcc0-4970-81e8-08d3bf6f2f80 X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1451; 2:r2QPTsbAaYjAMlANx3EOZQqfZVyE5EZ0Os8w17Y1uGVW5rFLBwRwSGDxAUpf7VuJ44dGijvSpqlHVwAOz8zmO5udWCHO/BBlpiGn2wF49xpRGnTzQhp4ttUpO8Cmcwb7XzwC3EFqEXnIwY9FVa+uOv2PZW0+Mf1w74SuHnlD2PwrTZaQGedwEBtKhyi6BGqw; 3:OEeG2HiDpMeajVnCBvG4zn5DuQeko8ZYWzHDuqgIE1XZFHZxU+3b8ovQ2EyaUHjc0wmU6QOrZ+WvHZILF2Y6/OexjayURUevz3hnWX0wk5hDeAyQU/hBl+W/TGwvItol X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:PS1PR0601MB1451; X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1451; 25:8RinIcRwR4+4CVf44Zv+qI97uV0gSksAYkrvD/7UawL8uROMn3ByfN+nR97b75rnClpFCLV3n7JhicDceLPHl+lMs/9h8x0KebGd+l63mSOZM2rkpQWwEUDl7ksywz9yEIM3UJJHPyJUbhcRnp8f7AdummG0+5G5lvyOQDf/qHil0bTw1eJahVl3OfmLFIMIe5sIhFnFvD/Onokkioo0TrY+u5ZwUqsRXRgl8kJGWzLxnz+3UGlJK6pReYAOaUNZHAi1Ch5UTG+vDAAOu9eMdxb26RV3Rt1mFFeR/ObULczV7H3AP1k2MXLRuVziBZ54HsPdsPazSF0ScKrK3IQ8Ghf9kbWPZf7voQ/v3xkELDhvlF16Hq2Nfsa6R+BzZAyueCQ1rMoQ1Cfl4Su1E+bylOMSMVwZ67QrIOAvET7qtF9wLq7sNIsIZ8/oWdJ6+AJ+gGAwnmnetI1MaDLCVUTa6u/gqWhuwMELrITCii/r3xDQzn/QG0sH6n86/5MoMcq3BXf+egRXEc8DmpQR2PGyBTZx3n6FiWTEJ8HIQEhCY+BNifd5Ajozc+q1wxadQeW626W6osAoFuq2x6oYt2CysVFKHj1f1mMbk+ZVg4S7qPa0IKbW3HaNuQmJ+QqsxkJiblzICSB1IiUC8XmJ1JFNQ897DKTGgEXnMNOOGEUAQkKUNnsNNQNjd2eZEcpLWxUpDO0pdlgKnAzOznhC9DCcaA==; 31:vLQ0/yWOAL71T7ynesHO9QxlzC4IYZAGDkEj5ynnPwgsYgI9F1Qv3dcX6qqhLauGIaRnH8rU/DSU/18zTJLLarZUjwQAyr9f4XsuwVvcntJJAqW9dv2s0BD8SEhwIVhPXEWgP4ynqHG/akjSqLn7Bz57Mt705ly8hFhmLMB/iyCillqnLr0k/yFP4umP6nUu8HKrtx7qSRS LKpjuqo93v0oiIPahDn/kR5qVWPSwRrU= X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1451; 20:cLccPEeC/T1G6SHpawI6f+xQGQLdLYhRubAkBPAt3xl18Q4yG9tj26ChiOF3KVLr89nWct5Z0ZCuwX5rgvVSnqgglipfA+NIq2TAapdCCe27yPAUXdtw1QjRDi9hNMf5PY5gFzWqm/NrNLK/kkTcRV2ZftUix7N0KO52d2nzKpsOE2IGzygnMQcGkcvfIt4LzRdeWGWFQGVuinTH3bPciTD71jb7gA+yuOx0xUbT0smtzMDg+sYB5JOCvSsvrNEtc8fB2nWIUcDBc2662CL5Nx7jLAiq3GsVG6IYhS8u+9vhjH9Fw99ymGzNlxYey9RI294LsI1F/uzNxK7jOxuamQLZ3DwZf7tv/u1MLl8yncKhpMxeHorD8X65cpLqk7nY7YpwI1oG+hS3dvy2P4Wd03wUgPqhByE1D/aDVUeUvPg5Yd0WnihCxPreYmMxzV5Dn8HxCcXSdH7/71Dv/i+Bk7wIPih+3CK8uJIUsbvFGI4U3uosEPD4XESzyfArfJwL; 4:f9kDL+PZUUK42gyNUW6ekZWQlMQ1J7TPAVVDHNplqxMlCvWzPj3zfBSy7ZHqjstib1PbEvQF7Y320HrcnDv0fHZf/e7u4VdhucrgEXk4iTm/EW6z+yPLl+W2Fxb8FPf28KCpA+EVDdpbrYE05rt42DGFjPytyy3Ih10Sl6ebK+71M6ZwJ07coQuY2LrQQ+w9OUimALQp2Lt7LPV1pOK+6oeALERXo7CgtRyJeeKVEPvDydaG1CUdlCn4SewKQ+j8tItTG4+l2bt4w1FO9/584S9UYhe+FjYG5tsrnIXWOo8f0pErRO5mr/CCw0yqG4LoPieXCzkBVYblGewyy0hv3ULDCaYhTAi7Ohy5iU/ZN6m2D5U1tmUkSCKCHUMQgtmdbR7WyKkUsrd1IZJlFmGdLA== 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:PS1PR0601MB1451; BCL:0; PCL:0; RULEID:; SRVR:PS1PR0601MB1451; X-Forefront-PRVS: 00286C0CA6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(199003)(189002)(229853001)(3846002)(6116002)(50466002)(53416004)(92566002)(19580395003)(77096005)(8676002)(68736007)(81166006)(46406003)(36756003)(2906002)(105586002)(19580405001)(69596002)(4001350100001)(83506001)(81156014)(23726003)(106356001)(2950100001)(47776003)(586003)(97736004)(33646002)(7736002)(42186005)(54356999)(305945005)(4326007)(7846002)(101416001)(86362001)(66066001)(76176999)(110136002)(50986999)(189998001)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:PS1PR0601MB1451; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; PS1PR0601MB1451; 23:L4JL1up+0QOUoyiGoCwmemC6GtjB4Wfug8BDtrq?= =?us-ascii?Q?yJcDiRNMFxxDxwm2Fisyzk5KJoxVSg7Meai1MdAj1co4Z7Ei/y1YctM+9sCk?= =?us-ascii?Q?L2C7ytRsR13dNQkE/BG1d50Z3pYCTPEScb40YSV8sJm52Kd+0n9BYuy85LV1?= =?us-ascii?Q?/Bdz2He12BhT9sN1D5bPTK8ACyRo+2sFahsjxMFYGvw42ewZ9ga1rviwfq09?= =?us-ascii?Q?8YD7CAsKJ7J1BogBMPD/OYmnKaL3tvo/XXnegm+n5Nqqq+P2+Ly/IymsCkp4?= =?us-ascii?Q?mmpjqKnzPkYxRCAcCfAfj/s1otevTcqoW8Ml30VLXJVGBv2ONXMLwjx8s8ZL?= =?us-ascii?Q?CW4sgJAUcKbrViMKTROLWZM/NY8SuxSdMfYtQAXiyCNB5LhfR1GGMcTSjSj6?= =?us-ascii?Q?pXdJO6fMBINOmTaFxW1+CXWxScXP4XKGkSiw/nxf8Cb0+59HiaRr4zJfFVBw?= =?us-ascii?Q?T1K2sB6/MOt1j5q1/O2oAu6hRDml4vhjzl6eYRCyuJZhdW25vjp2TR6tgFEF?= =?us-ascii?Q?PYy1n58EoMX9BnW6ISggIZvbMelsBDWedeH8e05KodczkdbzQxTVBx6q9U0X?= =?us-ascii?Q?nXPc2WckOyp506YliTW0WVN2uWpjoodhNDJRaDxaLq4LKNFSKyE74IfHFSSl?= =?us-ascii?Q?o2r3VFrXawFaaDasG5u8imm6x8ZdNl8T5AT6lbiENWSvElYqynNxAwJ8HVt6?= =?us-ascii?Q?rNQ0NZ0GS4d9gP4h0hPQv3S7cHm//Kp0fBFDqGhBZLJvX1WBp6td//jQjXKH?= =?us-ascii?Q?t+djM1mic4UxZNwAN0RHrVCHk+dbKL6f5njWTiGSviomHE7ZIs2PtR4kDmLg?= =?us-ascii?Q?G9Sfy/YgtChbUwheSHCx8hKZxdYXmwCSbSq8JXVbNvzx/Rx3SJP5EbPip4c3?= =?us-ascii?Q?/id0SK9eq5tqOKtiwUEUYy/dqThxMeg7TTDQisO3lSfN4yRYz/AQFDdbFmZV?= =?us-ascii?Q?nv3kvaTaiQemCm12BNHN2IIYRvCFDdprXp5wwRvNFoU3mbQr5Ne2ZCsQFE0U?= =?us-ascii?Q?LQC9jWS6cXGve0YmSXV+K8oZFSnLwSngy2OQm4ifGuuHPSJSRwK9wpK7Pmw8?= =?us-ascii?Q?6o959mHl+r6XRMYpwDfHQo9P7GEQgdZnNvD5D0tDwGLAMmIO+67IoKIIBltg?= =?us-ascii?Q?dpnRHxgX/ebhNdQcIylgvEM+Sp1KgnnF067Qkz+3fJMMvClBOQ7pTeA=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1451; 6:Zawjb7mpTk0WwhIAhFVN/gkUgHYN+1fnx22qgOlj7EBF08irWOdwMeQdwoNzLaZ4tD2d25O0TP1w00jgIbeA46IfJXe8bMYMyewmTtQJ48jTniBuvqqVu9a/2NrOg7Him1l0fkHleIP8DeOZk3lvAKl58kl9gGTYJLZj3+72eqrdGPH85ITOzt1AAnOYrifp2WPnuKhRbOrWgKK4lsDyJDwvC/Qz2Tp6dyAKT1sM3vQs3Ud+0p1Ra9cqIPpb5PrdV5NaN6AkyXduF42t+XpWZHhkDSePsGs19XICvV3LokPwLLRxqGNyCFu3rgYgHMuzxw3w610fJT7R3s1t0EmxmQ==; 5:jxBMPolLf+RFu/rUfi3g71G4RvxB0fYCAU7G8Upii720EuphJN/mQjkY3HZaYX4HG/7lkA6rDaKe62LW02J2DMK0ErmDJ6wUFEkEGUNm7GfTNY0uEjJj4+u5N/DBBa+t15f8aheyz1iZA3xcUmIpEQ==; 24:nGfSeJYBfJchBeF8GHuU8xj5jKzmRAuAVoBDg6DT9CSluOuFYB51t+/AgQvCU654WsDagaUp8vkuuNwPPwSsJGyVfAvvnOA7M6u+U6zxzdw=; 7:qmAk8axiYFQo9mkc/FXAguOUV7qyA723t5PcwNchDmWLMpntV4b8obt7t8xiI3KLMyiSQs/EOTeNDtsKuC6mUDwHzdnXR1HYbVXhQaaCvKGJq511ihL1pr8lw+rlr+YhH/IfYbxHhkqTboB2Kve6YEjNbtFfupV0qtxBCOg+NbUfoxsVFBW/+zBp8wEymQ2ceSxa4ZTdN5XgxOOsv9cAo30RCyWHlza6dlTPWRVhGtz9NViz/gf79J2Et61rkpFD SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1451; 20:0sZavAkGIROR7rl5pzfU27q42f+ayvtlHbwRUwekkegE0EylMv2WmGGrxpRmCfkE69wEQyEOeR3+kywqFlIw4lhSDujXmPWMDTsZvs1fpISpKT6KlrHE9WHm3cHsQD37FV4maSLuNb88qF4eGmyRqh4OgRGIWxMIVQpgGPI2BBY= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2016 09:34:24.4713 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: PS1PR0601MB1451 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/wm8996.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/wm8996.c b/sound/soc/codecs/wm8996.c index a730442..abacf6c 100644 --- a/sound/soc/codecs/wm8996.c +++ b/sound/soc/codecs/wm8996.c @@ -2690,12 +2690,14 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8996 = { .set_bias_level = wm8996_set_bias_level, .idle_bias_off = true, .seq_notifier = wm8996_seq_notifier, - .controls = wm8996_snd_controls, - .num_controls = ARRAY_SIZE(wm8996_snd_controls), - .dapm_widgets = wm8996_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(wm8996_dapm_widgets), - .dapm_routes = wm8996_dapm_routes, - .num_dapm_routes = ARRAY_SIZE(wm8996_dapm_routes), + .component_driver = { + .controls = wm8996_snd_controls, + .num_controls = ARRAY_SIZE(wm8996_snd_controls), + .dapm_widgets = wm8996_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(wm8996_dapm_widgets), + .dapm_routes = wm8996_dapm_routes, + .num_dapm_routes = ARRAY_SIZE(wm8996_dapm_routes), + }, .set_pll = wm8996_set_fll, };