From patchwork Mon Aug 8 08:47:18 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9266973 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 D5513607D6 for ; Mon, 8 Aug 2016 08:47:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C62E926220 for ; Mon, 8 Aug 2016 08:47:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BAF18279B3; Mon, 8 Aug 2016 08:47:26 +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 2C90C26220 for ; Mon, 8 Aug 2016 08:47:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751320AbcHHIr0 (ORCPT ); Mon, 8 Aug 2016 04:47:26 -0400 Received: from relmlor1.renesas.com ([210.160.252.171]:18282 "EHLO relmlie4.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750846AbcHHIrZ (ORCPT ); Mon, 8 Aug 2016 04:47:25 -0400 Received: from unknown (HELO relmlir2.idc.renesas.com) ([10.200.68.152]) by relmlie4.idc.renesas.com with ESMTP; 08 Aug 2016 17:47:23 +0900 Received: from relmlac3.idc.renesas.com (relmlac3.idc.renesas.com [10.200.69.23]) by relmlir2.idc.renesas.com (Postfix) with ESMTP id 1665C45284; Mon, 8 Aug 2016 17:47:23 +0900 (JST) Received: by relmlac3.idc.renesas.com (Postfix, from userid 0) id E6D581806F; Mon, 8 Aug 2016 17:47:22 +0900 (JST) Received: from relmlac3.idc.renesas.com (localhost [127.0.0.1]) by relmlac3.idc.renesas.com (Postfix) with ESMTP id DFE851800A; Mon, 8 Aug 2016 17:47:22 +0900 (JST) Received: from relmlii1.idc.renesas.com [10.200.68.65] by relmlac3.idc.renesas.com with ESMTP id TAC11845; Mon, 8 Aug 2016 17:47:22 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'";a="216934504" Received: from mail-pu1apc01lp0024.outbound.protection.outlook.com (HELO APC01-PU1-obe.outbound.protection.outlook.com) ([65.55.88.24]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA; 08 Aug 2016 17:47:21 +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=ymkZKoYxJ7y7v2NY4suIjGrPpREYiRrtsBieT1W3cqs=; b=mI4vm6sqdYX0+/2s8ec7a103XRSVkd/HX8o1TD/S5e38hKVXoQ6YgY513bS4YrqjL2gpWnr8FM/4BwCNcEdcHKp/hF5zDCgM972cRV2NUrdpCCY6g8IhuMx7LzDusjNqe3AO9p/BAHjyqpqIXlN8XFm7jwz836FwJrs61+D3PSQ= 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 08:47:18 +0000 Message-ID: <87shuf8xj5.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 003/159] ASoC: codec duplicated callback function goes to component on wm8985 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 08:47:18 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: KAWPR01CA0022.jpnprd01.prod.outlook.com (10.161.24.32) To SG2PR0601MB1453.apcprd06.prod.outlook.com (10.169.106.19) X-MS-Office365-Filtering-Correlation-Id: 1fb02289-915e-419f-9371-08d3bf689b16 X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1453; 2:sGJh869QLf4QTRq4ZzBKG9rGixzZQzEZUW19NMJcBog3Uu7Xt+o5I6Xjd40aNRbXnE9QPsUzTzrkyew7IHgYkpgINIkSmdBq28mH9rv6aTNLYbRj1rVNcxg5X9QDsFKeRIKUN80+liGzoQ8S1cXnQ5D5FzUVFYseqc+W0iMnznga7P2luSxSdFfwPtSTv45M; 3:SY2KT0Gh5jaq77v6gHUYdTh9331SVmNgG+qEkyCIiASmGKR0rWu8InL3uEIkOPyOlaY7RMIBWR9oCmRY9jbJL65QwvH6M75xzR71I0vgCCdDGOmI3oxzhdj1e/+U2Yxc X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SG2PR0601MB1453; X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1453; 25:macwrsP1cI6pRFbp/sjh3LsHoIp+NoFEPc8Pl1j+Gn1RFCBWBYLY4q7iMsUidRrp84UHy9CJOaEKMKSZDMY/R/vf5C1HrBncbPyYR8bp5h0rfX2xJFnKNvo1BsQbK5zdqltUnOtBjT7IFKVn0nd+J/ywi0N8L6c/15tK6NNKwqLvK29BiKMEQM3v3Nf/i3cpcGLWAcNpXinEtGfGTJxI+fR5iZ+oaYIBcJBBcmDb0qg59laTajNkljmauy6MNHLeC+21EVGDtuLjYG399J56Nw6RDSNd8QXWK46Ag6y0w882CTHOFYppqR61pT2UUUD0WJg114oguBU0ttKTTV8j9KWNZnrzevILQiJCiFtXaa8cQtK6Axfsa61i/EGWqzwe8AgAtXw1USXMlYHoq4ova6TWNzeFdIwu1Prz8FxXvLT4yk5ccHTEkX6c5ozOQq3xxV35L7vSli8izrVJ7G/xWnJPj7Xep872eamM0n3+9RV1vVjY8068a0pc65fVF/HBofzadh1f0JbV/aG9wgAbDCF8tyslK5mRLT6nm8WXqSGEIpHrYTNWQEFCQqJb96Q6Br7kBG5QR2DMT7d7VrTSEnPtne9rfoKFYrazPNutgU7XUmRCzP7HULc97epArUx9h7swfDO5UFieRVojocVQrmQFo/5kJQnOtt/uh9KwWbciRwdFlWGb8ygF/Pb4/0c4nO1xOymc7u8LrS+mepXgmA==; 31:mbbdAJrBt5aGD99pLgdT52zmPFDLjZBR2gSgxn0mZTfX/nd/bl++gMZlb3kdXyBz9n6p//6ph5mjGPwJnID0gC4KJhKtdyKvUPwke82GWLIm8tAEhzeRDXY81yChamgfStKoQCjm+/JEtxVGeIQcz3n/PZbl9Cl3oJFOSG9unwI7i0pW+iAv++KV2ELxEtfprbzfDx1g9sr m5t0lw/cj0RpFLbJ291hLJ2m8jmEbZ30= X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1453; 20:lYgf2hs+2rwbQB7lPNj1f+7BbchsEtzhofqdeUxjXufQsHkoxh/pEl7sqTqaH33BsLKg1zW6WzH8QMzsZv0KKJphr2qGrO9aZ84B4RI7hjhzhkL/YP2Cr2wCIVU+0DO4ZCFRlP2nzUPj7uI7Y3HkpOrNW+Lozfc1TFlG/5+kiR2rE8BLBu3xirTgU9Oa8dK3gKF9reoT6SWKT8DiEkk+ZhseFlwIPhO0sjOfr8V2Y9SZodxZ5BqzCC23+d3RAkvtaDAmWFrY0MX1KIa4N3QuOC5xi3ZxNM2mChtsC5ts/FJXLD970vKaIvev8ClNdC03JaUTOccVpKewPHvHivnloiY1iYqfPSJEaL/E6+DmTnAbWrFYmwuVoMCmpGLQCbwpGvGI3VPVqWMYnXPsr+AmcqYYxpb1N/U3jC5o9hc6ob5xqqXDjojkB59hRbX3m6VdLSG+TfZfYFc7OVAe07NZDHelnyndyYkj1XkPsmstF2JyQug0vEIHk1uIRSNsEdvV; 4:ISsHpF7JDTvM6dnctno5KY5JfnxCIubcqjYRpRLeJOglEBCIfZQPbf6MadOMNzdrlQI6DC/ZCkuJVTdDoBWHYaNCXWOrbaYfYMGtlxHCFzVRKCG1TRno1uQF/JK5PA0dH0Gn1Hv90iZjq129xSOy4F9B21sDum3rIxN+iisw8U5zNlrHWE4sOhvu+EcSI81zFdW5qYgwZORYqvAzVf5poAgcaoUSNeEpvNdtjCAH87Y2SzxH6b0Dht8WTgsBhEe1YtEsJXSQ8yKEXIkznFFf2ylRkg5wmS+AC9eOyaRr0TjgQzH6H91CpCUxp/RB5Lbyw0AVjlchNCJDsLXtqH43xwndDuwtVqqfAxN6+m1Lj1zNLFHFl3Yo4wWul1N+hIWAhVtl3JVyhSZZzt7ur8uSOw== 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-Forefront-PRVS: 00286C0CA6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(189002)(199003)(69596002)(101416001)(33646002)(46406003)(19580395003)(19580405001)(50466002)(83506001)(53416004)(76176999)(8676002)(50986999)(54356999)(106356001)(229853001)(2906002)(6116002)(81156014)(81166006)(4326007)(23726003)(77096005)(42186005)(2950100001)(68736007)(47776003)(586003)(105586002)(7846002)(86362001)(66066001)(7736002)(36756003)(92566002)(189998001)(110136002)(3846002)(97736004)(4001350100001)(305945005)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:SG2PR0601MB1453; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SG2PR0601MB1453; 23:a1c9oHwKnPAA6OF0l64uDONsROOpveEpYcnam0f?= =?us-ascii?Q?VteJkERP9IyJKtOu/dkAKsAGLh5XEOYTYDHpCge1SGjmxMGSnheqTleCQfG2?= =?us-ascii?Q?B/dVMPyiH//bAY+k9hUVpe9Y67rPzATz5v4SoEduIwnaBJezAupWP3QC+Fw/?= =?us-ascii?Q?4Ra6lM0oDcvwPtHutlTxjIqfuG0Jf74FkbfEbg6wFUy3i0nnA49++SwKuQio?= =?us-ascii?Q?YSd+oWvg0cQ3iGomhr4gJdW22vairH930Trybhmn8RXz1lx5N54+9muRUP7h?= =?us-ascii?Q?9MWY3OMI5MjlXMmE3B3jKG6sC2IC6DrkVlET6mvmC9S4dxcktS6Ud6wiRNdR?= =?us-ascii?Q?dBxJWUEh3t2zyKUAci1ek757kkQFxJoLVr55hy3nc/P6AbQISo524vOS4f2Y?= =?us-ascii?Q?dBqMGCFUNiE78P5rRR4E99ynLzQkrkgMQ1+/PWGICgvqW2/K8X2IpDaekVbI?= =?us-ascii?Q?zjBQhcbF6EO0hrYzQWSctk9AwGfofYKMHQrMpV2L/HI2b55PaO5EvOrLBte4?= =?us-ascii?Q?CPeMtHejz8cAj6u9UMFyzvhOhsW8gHLjxRuuS4N9B0lkozjj6Ry/Vl/DL3Xh?= =?us-ascii?Q?F/i2M0+Z4t9UJrgaBGMu2gUYgxsCouFlCkVVpNZwIVOqbtLS3lT4d5whkiBt?= =?us-ascii?Q?NkJ9WqxzlZeXm1ERiZYrbD8mnyUfts9UXrpy8q5GCQaSx/c6E7UWZSzbtFOd?= =?us-ascii?Q?sRO/7V7zRairRK4/fUdbLBz2cPjj6m3hjBRP+4GxhQCkquFirEEouAZAHlMC?= =?us-ascii?Q?Bv8xuVehcbKeCxu1Mn2O+1TimPZSkJK4TAH7THhym6klTdrwvKBO2cFdvks5?= =?us-ascii?Q?TzS4bHPO3FmFYLQpDH5kfU8EG8LV3laL+FIXdsJZm+9O56rWw2XueO69mkZC?= =?us-ascii?Q?AdY2HgbBNknjwBGGZhlgrFV2FFVn1kGHFnvMdpJx/4cjpzIVA6XqI5aAPXHJ?= =?us-ascii?Q?a/f+Eni/9KqwiBBjuU+F/AraMN17nm/AVOZbtl4eyv1ke60arVwBFQ2LELwx?= =?us-ascii?Q?w5+LS9fChTrVuNBHdE0Jtf8Rd33SWKdRCubMlitAR82OedMiAtQy5hcs1ZhJ?= =?us-ascii?Q?s2b4UbEkG6IkwTHP9oksRV1NEOOgtP9Ho6zYCwrNDZhQ/iGd4oCqtWmrQjhB?= =?us-ascii?Q?+ZO3i3CWgYp7+RPSwqqWLLKk19E6MeKov2SMfckXrS7OuAsHYwHyGzQ=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1453; 6:d1qTw5XlamOnSAQGNWUpYiw7vue7jcXUvqGynyLGXn2NHypYc7jnGA6QtbLrgbEFnAzRHD6VnEjd+caoXhgas200ZJmygv/a91+IYfPu0jsrYPly8HsWxQSA03HLMYhDVDzJqyyucLTpskhtKNxjd8N2yCzYEHPIVgldM7iy8UgRMgkGnMNSBA+EqbWofQ6bqoY3oPTF2ivSUT4ZSUHgpN8p5k0bf/f0pXtTyFbl7dQTtPxbZUjQFq1x04CIlB16VzDW2bAVHbLRhNFgmaEdf65N4H8gO50OVTk5V2Hn0R6vhiP1VPsBCgAEG4eR82TFqgdFj8cr2lR+/Jpr3bzOYg==; 5:AKDHYkBjdwu5Rm3ZcXe/MvhYZfysUQNjE9fQKIQ7n544lZAZluupZqSXqw+h3e8eZXkbLfeU8VNBqW8PCJa3wQ/a7beR34nvoPsqcTmkbkesfd8llvqKlpuH2orGB7gjxHM8oYd3KPrfN5lcGnl4eA==; 24:UoZgWXAAvKfyCyU70apKU2lWLITQUY9omk1uFo+9SLKx2bw0tK6AXcUTvcgKS4vtBYn9DNsdhor0+7xaciZUD4JDCiq2e/C9z0Yqaw4kStU=; 7:lZNS0UorHiNDH/zdiSJ+snh4YJzW1BehxBPVV05D4l8LvPl1t3x320Un90tJO7ZM8V3OOhrRNY/+sWOLnzqHDWwJr6AZYL66uNL7NwzA9DztTzi+bq5otuxdo7M0rpdkNAg25bbdsmeGewMcsbYXwc4lO8kloyrW03AXmmzm9UcJonml4ZuFt0mehMQ6LsLq0Dg0eiFGSWuxVVWvrgn26Z6M5coxfBu1vRD5aiesliJ8WZ1AzAtXYUrkjH5QJ8nY SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1453; 20:Stfv1W1Il69xG20UMxpZaDfx8B/Tq5w/svi0WqePoB6p/mkFHThQ2GBwEF2nqEiZgHAMRTp0juj7PAaU7J1xHn31Tb3giO+tEfxG/8TeeT8h+bD44HD8ae4HXA1Uojm0vOLrBn1bsgUPXz7ZZLG0UwKmzxRv27NZrn+0mfoQNqc= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2016 08:47:18.3109 (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/wm8985.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/wm8985.c b/sound/soc/codecs/wm8985.c index 7347abf..bcf3473 100644 --- a/sound/soc/codecs/wm8985.c +++ b/sound/soc/codecs/wm8985.c @@ -1110,12 +1110,14 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8985 = { .set_bias_level = wm8985_set_bias_level, .suspend_bias_off = true, - .controls = wm8985_common_snd_controls, - .num_controls = ARRAY_SIZE(wm8985_common_snd_controls), - .dapm_widgets = wm8985_common_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(wm8985_common_dapm_widgets), - .dapm_routes = wm8985_common_dapm_routes, - .num_dapm_routes = ARRAY_SIZE(wm8985_common_dapm_routes), + .component_driver = { + .controls = wm8985_common_snd_controls, + .num_controls = ARRAY_SIZE(wm8985_common_snd_controls), + .dapm_widgets = wm8985_common_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(wm8985_common_dapm_widgets), + .dapm_routes = wm8985_common_dapm_routes, + .num_dapm_routes = ARRAY_SIZE(wm8985_common_dapm_routes), + }, }; static const struct regmap_config wm8985_regmap = {