From patchwork Mon Aug 8 09:35:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9267521 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 B1910607D6 for ; Mon, 8 Aug 2016 09:35:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A044926490 for ; Mon, 8 Aug 2016 09:35:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 93E6F2793D; Mon, 8 Aug 2016 09:35:21 +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 15AA726E69 for ; Mon, 8 Aug 2016 09:35:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752134AbcHHJfU (ORCPT ); Mon, 8 Aug 2016 05:35:20 -0400 Received: from relmlor3.renesas.com ([210.160.252.173]:27815 "EHLO relmlie2.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751158AbcHHJfT (ORCPT ); Mon, 8 Aug 2016 05:35:19 -0400 Received: from unknown (HELO relmlir3.idc.renesas.com) ([10.200.68.153]) by relmlie2.idc.renesas.com with ESMTP; 08 Aug 2016 18:35:18 +0900 Received: from relmlac3.idc.renesas.com (relmlac3.idc.renesas.com [10.200.69.23]) by relmlir3.idc.renesas.com (Postfix) with ESMTP id 81D7252AB6; Mon, 8 Aug 2016 18:35:18 +0900 (JST) Received: by relmlac3.idc.renesas.com (Postfix, from userid 0) id 6F7171806F; Mon, 8 Aug 2016 18:35:18 +0900 (JST) Received: from relmlac3.idc.renesas.com (localhost [127.0.0.1]) by relmlac3.idc.renesas.com (Postfix) with ESMTP id 6882D1800A; Mon, 8 Aug 2016 18:35:18 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac3.idc.renesas.com with ESMTP id UAU30376; Mon, 8 Aug 2016 18:35:18 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'";a="217448604" Received: from mail-hk2apc01lp0214.outbound.protection.outlook.com (HELO APC01-HK2-obe.outbound.protection.outlook.com) ([65.55.88.214]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA; 08 Aug 2016 18:35:17 +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=NEsF2m9G0lVMJS8kHEmeCbHqRZi7v6+I9M93eNMfJXQ=; b=MeZ2ZxnkEEZWggZrFMrAM0jFxE913F94Qwqk6LMm8nUDySsxf57Bn1no+N4imIvSkODdn2kBoUzh0tR3YyL6xARyolMX586VJ+FAPDa916/WYcslZJvo4mx4IoIktG5DQFJRGuYfYfWbCIGG652wbw7rVvJtxIdxgN2+oW8BpeM= 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 HK2PR0601MB1443.apcprd06.prod.outlook.com (10.165.182.149) 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:35:15 +0000 Message-ID: <87popjzk3o.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 155/159] ASoC: codec duplicated callback function goes to component on wm9081 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:35:15 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: TY1PR06CA0030.apcprd06.prod.outlook.com (10.164.91.40) To HK2PR0601MB1443.apcprd06.prod.outlook.com (10.165.182.149) X-MS-Office365-Filtering-Correlation-Id: 691b0e62-c1ff-43c3-5133-08d3bf6f4dd2 X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1443; 2:UTy5smqbX5gHXg4x0v2GBA/FrPLt9rJvccz3C4xolzGx08WhMdrr09H4zvpqrMJESMfVDIwx2vwK/yMa4qUFIaLEX14BuN+5dIFugjaUjTCgMJTaVqEnOeujwsUo1MnsM/mPv/lMdUz3/7SFGZKrD8vE3WkBgLTcebrANmGTZMp5QPvX3FXTgewoIkGS0zhH; 3:vhaZoFX/FINCxCHRXVbbrDKusEujUST9RDrYgPfHf9tR1uyc9Y7QMmkr8oPBv/boCRNQSMg8NdtUNaprTa7NQ51kAIXlpx52Rp9umpgKHgPtS6QI7N6z0ladEyQYR7Z4 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:HK2PR0601MB1443; X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1443; 25:qQeOuVugONKnLwV3lodh42dfm64f6Psx+88oFtrFVzcetAFwGkYbWC80dfCD4il1A7sxNs5vfrqzaKMSDln9Xj80rW8WCC2QCyVMSv8K7BEVZOwzv32KuXgNxD+vV/tcAcRiShJtPuxYEneTJI7aWw3Sl5nCJ9lD82/Lty9adpIQs7a2laSCYvyPrfmtoyYEPtu6GpP72HiqSDlGh1ElU463MuSaDbVlaXMT3Z59TUrIKq4JXoNNHEgprE+U6BJMJuFD5cYRUROq3jRx+e8szGW4lv6FNg3+cyns05TKy34DOhXRoMsizfhAut6fyMLaaVHj8WGoXOXhF2dA4sX5SUNP/Rsz7Y7TsszDidOperCqJ3MK9NV729CeLojAaGre6PALQ2HLOv72sCewaahFQvNpkRu0mlYvIoX9+S++MGOneWQ+0nXRyYjelPnqslZAgzkdg40U+tAdSBH+2qC6p9Wv/Roz48+Oh7ztsqXNuu/rijXEXSFka0qCYvyPiJYSvaaLn+yXNGrpDhz9ZCJIE4lYyuEEQoVcY0Uctkgui937HqBtnAa3E9ZMsFNcC/pRZMDWsMmLkkCTxlr0PbZTu7reCFo+4M8FvnL/PStpkhRxUwk0pHSDvvM81YSxr/Mm4ASBMqQPX/GpBrmnTRf5RObuZIVDgqppH3oK18m5xc/TfuYfyiHgi2+Txy1N8pPT; 31:dTBacTS1e9OxIq65BKv3MnrwQAl7EdJm4uCkcJS3HQvwaiEaoQI0rmhYxZ4O9hJj3ysYbhhyyHP6oY5ZScaYOp0Uf7GNFD9oTH+BmYfSKBTqghd9BrSpRHNrG9ilzBfuJO6WBhmL34vhTT+vS70V5DBVgoeqZD+J4oycpEqJKT2ExisWC9kUGsJsDqdz0zC9rmTHNWIS1LpWngWpKRfQde9XJzGHeUmoDoA dpEr1Xxo= X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1443; 20:Y2sxlu29iV2LaZLqRKWWSEG6DY1flXCNVsSfC4AQvvS0pkuPxH5lMDZ9lBMuYiBt9jybqTHVszdlXrQYzSwrKo3tm/o6PMfH1MdUU1AnHDgrCUuXFDxc7DQUmLJOSRoGiqhnOvI+Vulnveo7yBPQrFLKbU8exiPLqyW9nAn2QEui/wawGh7p/xm6i9wW6iTj5d4irCmIY/1Myw6oajGekdvo8rovd21U+Yu0iOx5wXYOFmbubqkOS4PnzqT4+ob+ap6wrm8b3r8E7gd6GVI8xpWeBGEQEKJ5ksx++tvDlM649sp1geSnCDs37ZBWQtAYTOTdEyaEu00bSaDQS3vyEE0c7EnRXJjSNj8oWA1oXEBQhz+N7pBk96o8ut+lH1HME2/r2EnTzia8CLyZbQTnbK2zW2h2stLruQapYbJxIcrAlLa41P887n9NK7hynlM/OuAFDytmQ1CNO8p7ABtPrs8lwqqxXJyhd0x6BKOw0vX9Zdy/7H/2rdvEEElDObe2; 4:rkMi21OINXzrD4YW6JquzdHE1AuQlTgIqzq8wU96ex3enYv9TkBdkbagrHxnz0pnNlnbKbDwv6arLNDlOiUWgC9fP6a6KP8SKbZXIdIGWjUpeUwVuUa3Vce4UttfmbvVnptR2UVX8YqgCVLhrYlsfD0l0DoAHtfQjostr1eLKcLPDB2gtBTPAfEJ4tpxoMK/P2/+XwVTUJvIseUOOzAjz88aHBHkvcZGPGRsF+UCLM4IuDb/U/DJuit2C09cALHbas/oO8DwIUNCcEQqwQ76WABDjYIRAiWRI1ic9h/ZPQrchFskivkwCDI+k1fCLeGonvMz6dTjMCw6bPXIB7RtLucAvpY7Odo3jW99ga00x5a8CBSU2xjuEZscXQh+XFdS3wCzwX+oQeaIF4PeyEFImg== 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)(3002001)(10201501046)(6055026); SRVR:HK2PR0601MB1443; BCL:0; PCL:0; RULEID:; SRVR:HK2PR0601MB1443; X-Forefront-PRVS: 00286C0CA6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(199003)(189002)(2950100001)(105586002)(101416001)(81166006)(81156014)(69596002)(229853001)(77096005)(106356001)(3846002)(19580395003)(6116002)(19580405001)(36756003)(68736007)(586003)(42186005)(76176999)(92566002)(33646002)(8676002)(23726003)(2906002)(4326007)(4001350100001)(86362001)(50466002)(7846002)(83506001)(7736002)(305945005)(189998001)(54356999)(47776003)(46406003)(97736004)(66066001)(50986999)(53416004)(110136002)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:HK2PR0601MB1443; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; HK2PR0601MB1443; 23:yA8fYg0VmvEhD6rOkV2oGDGdTuiERPw7NzPw6mE?= =?us-ascii?Q?/B5brHyMyCZuVk5BCASuOP69IFMaDZnFde1zFRIMmHG2mBkGmZ+6eGMUhs6N?= =?us-ascii?Q?Wmw8zRQuYu5NhcDz9FgQj/YAEs1SdCnup1HX8eCZco+qVKYh6pP3DJNd0XbC?= =?us-ascii?Q?9sS2sx9dOUWbcCCLqXsXe4oXAJrN0t097SJfJCDUE4ZMfeAQ2xRqPlg3DO/S?= =?us-ascii?Q?c+iVMo3Si6f7secTuImngYTSAm9Jpc8v8v1a4U+WpIvkOkerIe8Ast2Ogn3E?= =?us-ascii?Q?FNDrKCYu6RgClNlH6xFGnWa3tFopLBw6aNM2WfwKsxKDadYyRy5CIOtwAICd?= =?us-ascii?Q?92wDdgBeMgc4R5I8ZWlc8JejlB5i4c4BrZ0JxFHXkKE41hFdRp2jYsCXqIJu?= =?us-ascii?Q?vWbyqYe2/AP6j7DN5SLqmsXLdq6eYzXbLBr+lxzWQjt6+fYL2lReBfUlLsJ/?= =?us-ascii?Q?DxXW3Inbjg3RLyqRhDgSbhHvRx+ot0/7nY3V8BYi4nSEQnsR5x10f2Uzr6cf?= =?us-ascii?Q?d+7nvwhm5F86MThmXb0P2V2Il8pOk8Q7q/tHDUkFk+PeuBNNjGox/VP49ore?= =?us-ascii?Q?yasL/y2hCO5zeF1cM2EchhP4haHXbdkjC0NOY+81WahYSM8MdVVZ/8KZnzJt?= =?us-ascii?Q?N9EWy8wl72ZAicnSOU82ehUITHJ6qjkRJxyJGWJLFw9/KJvIZ5F/c3lpbHq+?= =?us-ascii?Q?gP/vBWpdzf+QaIqxuMk6HxKk/UXqk2b74661Vk74QpGVGWxWzOmAgwCzoKxh?= =?us-ascii?Q?7dOgXTKUiA/P4UK4rTgmhjJE2SGvk1bbBqTTuKyVp6T4sPlnK2Y68M91SaIX?= =?us-ascii?Q?v7niWzCNp3A+qrkEZS5x1rVgFz7ivKTeRmlwmb1FwN6aRBOVFXFMAa8/F49x?= =?us-ascii?Q?WSwfRldOfaoWNDeMT64k84eDgj9tbTnXiHR2cYU8a59ElAyQ+YRF5gegyAwc?= =?us-ascii?Q?R/B4Kd71eODjpTZaUWMHnFE+ME9qzv0eOJxRWV+fGnfBNCuGQi3jMsbj9ZZK?= =?us-ascii?Q?Sed+6+l+a7tSJWVt05C5+dCQu3YkR/PcfvN3AIu4uKopSxeUMVIrCOxqaJHS?= =?us-ascii?Q?+sX8Cm9dJ4z4h16tbUoXGIeNLiJxxRdoUpa3kRxpC3GEZIxZXffN9HY2Zt05?= =?us-ascii?Q?tBBKFmyHbbAQvVLzOo0bmSaz9sJdpsAfAcqwzHwRVuyh9H9B5xOJ0BA=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1443; 6:lb/+OFuoeXW49JLnu8KaI0TO2Yv/jYTC9km/vj2od/vyslVSTwUzBAIS395jbpaEtJ7Jq5zaYtWTX12OrvDMFlvO1KrLs7GfN3RKtt2+SJWPNo1xPeQlVK7r9biBI/Ku3yysZX66RbGEonpXVfIXdmSodVsQ5IYJQLRPFTyw27dyjCRMfbGWR9gGHZE0tMwEDWlXgf3JiF3UgGyENMMnkbpodi2vfWGl7xN9KDKb2aIjN/wlaVAGKjjNnnf9ifPpzMzs8hNjkh3/WLLwCVSWkYV01CDu5IwEujv/cLIaXYQH3JaVuj4+h0hzHYPbmidU0EQtdlk8cVYB0YxyDd7YUg==; 5:76zzQ1keKFCQzBrE2UKR/845qPqJFuh1y4VqplUS0BCJN5Wjrw800X0RFfWUQDkp2BS0qcs9CxV4/2FjPYexQJwlILm7LdqOb/p/zqFHTJmhPJyEPWQrKDUwXsKlAL8BT561poCVN4LQcUDLF028zQ==; 24:XCW+3Fn8pAV0B7vEufCUnbCJCV3TG6VRSK9MfFCF2ZU7CmSvoHRXJSnnf2QFynYqhJsW4Gc/5rJQt0/sCQAGj1dIRLSr6AOKq0lR3qEohXE=; 7:bXRRAw8aYz4BrU9hO4NYA25kB+X6XLJBFmC0KJV6aTuAJex52G89K15O3f8T4Pqalvs2YQpMZuAQbSMf8N81oDndhgS+dXlRRKXh3TG+C9VT+mKZUFpyX9Zw4GDakHsIrhRLVjM/7uXJJIRZ0jc+LeHVO4UHff5abo9tZAa6IB69xoeqyGIdzz01rkCBpTJPyDopbVd/nOHuETkDKxTSNzTUP6owKdxRqk2FcMWiFLVmPbOj4EnGysF/bNnTAIto SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1443; 20:j/jetVD6NKGNyDdR18uCCAPI4vURp0NkDb0DhUiLb7IM08hx9Akadxfj6CEeME2+OfhHc5FzimEvBjBY7cwilQ35iw7Y9KBhvBpdB2ak70SIObJxuvdrsOowxE6xMyEL0t3YY2OAvtSHjBQgMz6butZdiB36ktGMTBEV5HlaYvc= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2016 09:35:15.2711 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: HK2PR0601MB1443 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/wm9081.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/wm9081.c b/sound/soc/codecs/wm9081.c index 363b3b6..30eaf4c 100644 --- a/sound/soc/codecs/wm9081.c +++ b/sound/soc/codecs/wm9081.c @@ -1282,12 +1282,14 @@ static struct snd_soc_codec_driver soc_codec_dev_wm9081 = { .idle_bias_off = true, - .controls = wm9081_snd_controls, - .num_controls = ARRAY_SIZE(wm9081_snd_controls), - .dapm_widgets = wm9081_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(wm9081_dapm_widgets), - .dapm_routes = wm9081_audio_paths, - .num_dapm_routes = ARRAY_SIZE(wm9081_audio_paths), + .component_driver = { + .controls = wm9081_snd_controls, + .num_controls = ARRAY_SIZE(wm9081_snd_controls), + .dapm_widgets = wm9081_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(wm9081_dapm_widgets), + .dapm_routes = wm9081_audio_paths, + .num_dapm_routes = ARRAY_SIZE(wm9081_audio_paths), + }, }; static const struct regmap_config wm9081_regmap = {