From patchwork Mon Aug 8 09:34:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9267519 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 A3715607D6 for ; Mon, 8 Aug 2016 09:35:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 922972679B for ; Mon, 8 Aug 2016 09:35:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 86DE026E5D; Mon, 8 Aug 2016 09:35:11 +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 DBD9A2679B for ; Mon, 8 Aug 2016 09:35:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752131AbcHHJfK (ORCPT ); Mon, 8 Aug 2016 05:35:10 -0400 Received: from relmlor1.renesas.com ([210.160.252.171]:50851 "EHLO relmlie4.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751158AbcHHJfJ (ORCPT ); Mon, 8 Aug 2016 05:35:09 -0400 Received: from unknown (HELO relmlir3.idc.renesas.com) ([10.200.68.153]) by relmlie4.idc.renesas.com with ESMTP; 08 Aug 2016 18:35:08 +0900 Received: from relmlac2.idc.renesas.com (relmlac2.idc.renesas.com [10.200.69.22]) by relmlir3.idc.renesas.com (Postfix) with ESMTP id 0225E52A92; Mon, 8 Aug 2016 18:35:08 +0900 (JST) Received: by relmlac2.idc.renesas.com (Postfix, from userid 0) id E60682806F; Mon, 8 Aug 2016 18:35:07 +0900 (JST) Received: from relmlac2.idc.renesas.com (localhost [127.0.0.1]) by relmlac2.idc.renesas.com (Postfix) with ESMTP id CAE012806E; Mon, 8 Aug 2016 18:35:07 +0900 (JST) Received: from relmlii1.idc.renesas.com [10.200.68.65] by relmlac2.idc.renesas.com with ESMTP id UAF22123; Mon, 8 Aug 2016 18:35:07 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'";a="216938626" Received: from mail-sg2apc01lp0248.outbound.protection.outlook.com (HELO APC01-SG2-obe.outbound.protection.outlook.com) ([65.55.88.248]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA; 08 Aug 2016 18:35:06 +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=qNbzGVThmu35ti39Jqy6lRSJMi7TP50Cf80H6xpMqO4=; b=lYw0BQadhdzyaqCqMb12AUZwTVMBAQH2R5d7FGVc3kqbw4ZECugMdExt6gkA5WNrbZPYVm60pYppYLEOwCnxaaJjgJ49gJ9H0xuAcIFK56WD9ZeTQ/VwDTKk1WW71YcWDaUyQko3u1/LyVFNNnzLEm4hj3hc8PAcZFPvokfxd/M= 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 HK2PR0601MB1442.apcprd06.prod.outlook.com (10.165.182.148) 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:58 +0000 Message-ID: <87r39zzk45.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 154/159] ASoC: codec duplicated callback function goes to component on wm8998 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:58 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: KAWPR01CA0011.jpnprd01.prod.outlook.com (10.161.24.21) To HK2PR0601MB1442.apcprd06.prod.outlook.com (10.165.182.148) X-MS-Office365-Filtering-Correlation-Id: e192fba5-b282-49be-cfa7-08d3bf6f439f X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1442; 2:D0hc9ufIQuG6AZZrBQckhA83O1/CoTQGxhHtPbuErmzhiPJpZCoy7UwJRkLhli6Ml5kX5RpusTkjWQaRmujsPSvOMDMOrxopNrR1mXtnfSh+FrQqd9hUkrjaUBwFb85Xq1BMT0hV0W0IcZO+uasnaqLIQV+ZdDO58sTWp9OWdV2lYwvH8IJci8Q+U6Kd7j0L; 3:edJz8+R590AZB8HsF5smqy0VkEwuy8nYhZ2KPetblhaCbGJoZUjkmgPG4J40bCfPuSclntcF2CVyLS9ZypFiXIVCtbQSCrV/YhXXyyjwDjbLcl9Z22q4W5XB22eSR3C8 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:HK2PR0601MB1442; X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1442; 25:6nyrYM4f+QVS3OaIXnBOf/TrbAcSkKS7u9UQJfu43zbkozFwoMdjz1VEfmK24ecTv4J4SsaDm19UFyXTxysHmQ14k+lSjCSp3obVt/6hfgKnBzzu50SSJ/qrRodkx+XnlrkwF5UfWw65qmsMfVyGSqlbIuewE3cpt1MyKfqFCtaTijkFK6WXmbvhvlkk3V+HNiVYp+ZbbMYk2NdEYJtw4Pnc5GszhHXjaN2M0WQHB5ujwkwm1l5wR1YE1r/hrnwmhlEVkkxR1HVqPze2KuS8x4HB4SWKd51OMXmniLagiaAaiVXJs6WTIq4xxdoF7O3hq0AJVbQY5KZo6d4NvuhHrVOIjcOZKMR6myqooDKGRaGTiLRaSdUNPkxPPaxIzfKNwbb+EGTWc2BwGoD57Vb9y45byEsGaAL7kTCxBgfPC2H2cVgCAt3i6lNqwV8FWUFXQaX11TEZFAGAUOHzs+Hh/IwJ94d3ajvhoiCnJrdbht+xR8mwO1E6h0PzRUCWOhQRRm1JHAnDV2xJwYMH9h+gxJFLEtccYcV580SZo/uJFHeEAkj1MngNpBWYRfLd39sSU+MzRCxtQe2ByzAZ0Un8PZIX9KUdmlJ9ioyxm8U+z5aHjigdEUGddBiAFmChtBH+f0KqjBLo02NBrZFsSk+mXo+mRFvDtEkYwI0FEcRtL0672kV95Z8h+B6/sx4WaOxi; 31:TUWqO2ZoPlDYV7cUVnUy7wL3F6dJvq00keFBZKzcXeqpHgvcF5gvush59vHXZ+bjMpgcOOA6KMvEg+9DdY2qsc7DJ4n/DtdGhOrr+W6t1AI8eZMZNsjd1aj1I6XEX/7xDGTK8FcDqeOrc5Xytt4u72XrxpTAgGWAIsxGGL48J3kmNY8YsUQ1EuWsjBf5ibG6q/5VUPnqTD4ktXdIR8Oiy7JLtqp+R13R+18 +tdtaNac= X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1442; 20:IuP3IqfsKrbGtBKppMcYu0ByzcdMGVxxUqN2gN8ykZW/Wuv/Er5ju1clNYOjHwHixU1r19aBr/KBZ29ypt6JjT/j37DcCEky2z19js+tJRSRMpBBkjBxTD393mDhnCfJEcZW3/e14S0ZmxTervkahvwEuSBvfZzdCNtehIGXMmzpdaOKZNswijIMFusKFmpSmE9oPaePAEgJr2SZBHVRiHHlKVR5iZ47SNWZXeIoHdCOFUs5uX9AoM4eRIat+pvN9JdMtx+mxDarjZFJsVeBSPfuzm4vAfcVVX5iEIAV8+ZI4+HMWN4kanm8wM7dPehh3rDM7nBFZLCsFalCvTn29Z4nLtGlnGOyLoQC+HzHUGmE0m2y0+9xjXAEiRZO/DvZIpzgnmgX9l9Hp428iu5H5pLSurhu4DQhWnyptwvikDpbvPH/4n9E7qsMM6PB3EAWK8ee9V/FsW4X2hGZU2ImtMtqcJdvUfnO6TPnuJCuUVbNmX91L9ULlHa/9TjybVsG; 4:72O+70/E9fkwZHv2PhkPgwClTt+RiQlnCSOvREhcJIbU7fOQZrQPupJegh0H4uRM8XG1VXF7dfJwPOLSJWo+XBGr7W8yBq0Ftin+tlTzgNOKujhzgdg2E7e9sq+HZUQd0xwb4fC/mBS/6q/zOQ9v3cRNV0mLu0Ouz3qW1PhZeBsR5Eqy5mxOVhi7DTp2GPsABONNrFHaLPwH42g29RZSkQzALixAT85affjPT1AHEv8ys1xNTbKLT7CpdvIB5kSe6c2Ke3jGXwP8J9Yp2k3rPO7ZjNGL0aQtUb5xTWI8kQDwFyNifibfg3EEnqlzX4QLaEyHoxDUfBCj3Gjn29o6sSO37R8sHjscS7qSz1kKJml7OmTCaftYYIm6gggDKT+Y8q8MwtBXPfaYYLFA5LtIaA== 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:HK2PR0601MB1442; BCL:0; PCL:0; RULEID:; SRVR:HK2PR0601MB1442; X-Forefront-PRVS: 00286C0CA6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(199003)(189002)(69596002)(7846002)(2906002)(92566002)(86362001)(83506001)(305945005)(54356999)(97736004)(76176999)(19580395003)(7736002)(46406003)(4001350100001)(19580405001)(53416004)(4326007)(42186005)(50986999)(77096005)(8676002)(66066001)(36756003)(23726003)(110136002)(586003)(47776003)(50466002)(3846002)(229853001)(6116002)(106356001)(101416001)(105586002)(189998001)(33646002)(68736007)(81166006)(81156014)(2950100001)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:HK2PR0601MB1442; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; HK2PR0601MB1442; 23:dLuS8bD3Jn+AOSKi8UAJ/c+2lTVB1ivS9/QJJop?= =?us-ascii?Q?yZaMV0guQr/FCswMZ4uLJsbd0yVcv4P8GYjnZeEXGVFCnpIu2rP7e5cC/TBV?= =?us-ascii?Q?pgaAchLrZJCnuAuM6Rzt2kbe7eYJMtAaIn35cxRnruzh3ZoLGVVsBscqTJmo?= =?us-ascii?Q?alODMpr1XxtDuRVpjJmWNamg5awSNpJbCezyIQk2MoW3/Yxo4drQW+IS4xna?= =?us-ascii?Q?pguuICG86vLG3ivM41OJ9hKsruyMO4qqweQbImIwozfVldzUkA5+4N7d1Bo/?= =?us-ascii?Q?H509CiOup75zKEluu16r7xKBfZ1q0f28knAlyx0HV9T7FNUekKzB8IqhNjTF?= =?us-ascii?Q?k+GBC+IJMHWdbWMRL4JEMOtdLDuUCpJPtVvJ5XPcCgqWvYMsmEm+Yo+JMYhp?= =?us-ascii?Q?CE8XyWv5+B60DrPnDlb9tZ/wfnS4fT7CGjRbln4gEsUpqvF2G1sPJcH5Iyhj?= =?us-ascii?Q?qJACbIt2AL613kNzjFDrQ/l68Kqkcj+QAap+2GFlUg+XiiygCv0jPhWs0QL2?= =?us-ascii?Q?RGK/738kPfYP9BWTB4vmjrVUOE1VzHhu47EuRcfgc3JMqdoO2L+t0mdKVUu7?= =?us-ascii?Q?iYfwHR34PXJaWUBR6+26SK+TJ7K0gnxqGjwu9H96Nwr9cmGyYrvS3W7rp6X9?= =?us-ascii?Q?GkujqGMH+q3oA6Edp/pHYTquyE98CMfucz+WyX4JkUc2i+xZnr1W8PmWrjOC?= =?us-ascii?Q?FLd4o7kOnGCXQs+LPuBi6FC/IID3uc4FbimOpnGivyhxqvJGo2FUdb02J9d7?= =?us-ascii?Q?CxxOBrH/vAI21WTOCZLzxZqyz5UGXikVyzIjOvyhaatr1Q6rD5omqsnfusDe?= =?us-ascii?Q?GOzSblFcHj0RW0PuH/2pMxiL0d/BHF+xF/DvllcMrLKCsJmwnipGdB7F6FEr?= =?us-ascii?Q?VOHqQnqNQ1j7ya8xihfNuhV6s2C8AD8W1DDKTxcQZKut6/SpXnO1hIi4GkNv?= =?us-ascii?Q?K31vPWg5WHjLG9IZr87CYgJ1tGLHlJT5008FpTbWYGI61R/a/qqabLC6tziU?= =?us-ascii?Q?MxXXCldQQuK2/gLscG79N7Df63J8icNIsuYilOKcfUOQE0dkS7mY96dRk2m2?= =?us-ascii?Q?MgwzqdvwwIdArhmC3bkYn9wkolayJeBxlkBLDVDGEY34PNoOPjm+hK6YVktm?= =?us-ascii?Q?QhmlUmTG9MnacTbr4eAgBLADOBAUJRnLDwZjUlrUV1psP9IF/2LPTQg=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1442; 6:RwFp7kmlPUZfFvFMtoiRNUMYpH5iCwJXY4T5fJyuX4kFjjmsP2Arg6iYRbEapmVfdw5cSHrcF0RrjZPW/NesjVjfk46T9l+EwzNgtpupDuK+VCRySkyPU9Ch0UGNWuDgA2Bb/1bdXTok3J9Kn0+XleGKXCbf+CFtaFGSe5vC+CQJVoHGwtp/MFs6FjFMGphjGulvrrAc/6pI4ccWWKWO8TRKpGqVqulA2/zAVjw+VnNTLf3nRr/zaDla4dYA3eNScdFii2wjhcfBY6Wls9TjsMx9XJE8qVl1kGuYhRbG6Wn6O9Vrz2ikyjUVkwiLIQSn3MEtYwrp9+rwZkGmdRmNpQ==; 5:CQsuabCbP0QCez1WC7o2r+hhEHrmfiIQTJQBzaIvsQrVyjcay0ZowscLEK7LtEHwQFnLCb/n7V/DWAQ9CL9z5CnoNgkZWvWCsJEd8WSyVjc5n+1n0ZjA5ia3H2E7OE4xTn6E2qEQoGnWHd0JkShsig==; 24:ppVlU9x+hY2bYUNjhPx1DItp0EceIP/zh0RtXpl/yLQZzO9nAZqp85NjckXpDmpBfiaE5chjX4LMLffMCdaTejEkUwclrzoRGE/3VaFtmwU=; 7:2Xf1aop7jWGjTH/c6SXAbSrmUtsJcHXrfIweeSJ4PFPgRdF8vdFGYacCvEGwaQZtGGUvWmcA1P1Mr7X9Q1QXi0cuQjJFb8hETz0NoXR2TtBpbe/th8wV6BVabxeEN7Uwpbj685qI+RVtrRTzFIM+FYB0EMlGW18Cw4zR2crPEEcAY6eshYToegR2OpTBsHv5e+jphPNl3V5e/wGs6OmXtOohst9BBvkvAq17/1mLKvsUMGWRyodpubKxki9myADX SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1442; 20:lFZ9KJFnnXMaj2PH4CwBi8xEX0tKjJhxmHpUAaFTL2NYnhPp0bJboSAdugu9GfnS5rbu6oVJx/a9OlstbBWX65pFz9SIobA65CNFozMWPWusRL0nhZSpv7brwPPWET9tLtmc3hQ0t1pOhy4DFjZcwuHkY8sub/oturjNKChVktI= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2016 09:34:58.1598 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: HK2PR0601MB1442 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/wm8998.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/wm8998.c b/sound/soc/codecs/wm8998.c index 3a5c896..315b23b 100644 --- a/sound/soc/codecs/wm8998.c +++ b/sound/soc/codecs/wm8998.c @@ -1361,12 +1361,14 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8998 = { .set_sysclk = arizona_set_sysclk, .set_pll = wm8998_set_fll, - .controls = wm8998_snd_controls, - .num_controls = ARRAY_SIZE(wm8998_snd_controls), - .dapm_widgets = wm8998_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(wm8998_dapm_widgets), - .dapm_routes = wm8998_dapm_routes, - .num_dapm_routes = ARRAY_SIZE(wm8998_dapm_routes), + .component_driver = { + .controls = wm8998_snd_controls, + .num_controls = ARRAY_SIZE(wm8998_snd_controls), + .dapm_widgets = wm8998_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(wm8998_dapm_widgets), + .dapm_routes = wm8998_dapm_routes, + .num_dapm_routes = ARRAY_SIZE(wm8998_dapm_routes), + }, }; static int wm8998_probe(struct platform_device *pdev)