From patchwork Mon Aug 8 09:25:40 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9267429 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 0EEE560871 for ; Mon, 8 Aug 2016 09:27:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F292127D64 for ; Mon, 8 Aug 2016 09:27:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E77F027F8F; Mon, 8 Aug 2016 09:27:13 +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 4254527DCE for ; Mon, 8 Aug 2016 09:27:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751951AbcHHJ1L (ORCPT ); Mon, 8 Aug 2016 05:27:11 -0400 Received: from relmlor2.renesas.com ([210.160.252.172]:61263 "EHLO relmlie1.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751670AbcHHJZq (ORCPT ); Mon, 8 Aug 2016 05:25:46 -0400 Received: from unknown (HELO relmlir4.idc.renesas.com) ([10.200.68.154]) by relmlie1.idc.renesas.com with ESMTP; 08 Aug 2016 18:25:44 +0900 Received: from relmlac4.idc.renesas.com (relmlac4.idc.renesas.com [10.200.69.24]) by relmlir4.idc.renesas.com (Postfix) with ESMTP id 6CC3C59A0F; Mon, 8 Aug 2016 18:25:44 +0900 (JST) Received: by relmlac4.idc.renesas.com (Postfix, from userid 0) id 63B5A480A4; Mon, 8 Aug 2016 18:25:44 +0900 (JST) Received: from relmlac4.idc.renesas.com (localhost [127.0.0.1]) by relmlac4.idc.renesas.com (Postfix) with ESMTP id 5F5F448014; Mon, 8 Aug 2016 18:25:44 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac4.idc.renesas.com with ESMTP id UAA15635; Mon, 8 Aug 2016 18:25:44 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'";a="217447893" Received: from mail-hk2apc01lp0215.outbound.protection.outlook.com (HELO APC01-HK2-obe.outbound.protection.outlook.com) ([65.55.88.215]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA; 08 Aug 2016 18:25:43 +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=lWCZRf2rfQlfVunjspNBsC7+BV98BoN2eKAesXPcDkE=; b=WciKVHwpsSwAmZn+jYgmbNaVZVHUNiPib1HuHmGcgdheFoPovwblpFSj7XTzAsY+ZCwiJkrGpLRk/ZoHT3UKkxvhB/8DUgxfICl/ygQDdfWLiwzrwCuRcNVwM68WFz9NkL9lJ9WZyc9DJodpkYGnlyiZLCScNFHWcHVdw2sgD/w= 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:25:40 +0000 Message-ID: <87zion1uwy.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 123/159] ASoC: codec duplicated callback function goes to component on tlv320aic26 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:25:40 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: TY1PR01CA0080.jpnprd01.prod.outlook.com (10.167.153.168) To PS1PR0601MB1451.apcprd06.prod.outlook.com (10.165.210.155) X-MS-Office365-Filtering-Correlation-Id: 4b531205-1d3c-4a87-2794-08d3bf6df704 X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1451; 2:pPRWZ0xmosN7YcTwenRM+S2XnYd0MNftdqXKrfszIx5EPzltOzEWVbz2RzH0MHLGP3puwwjX9U4J5mR9+irCoqBtN2kvcl63BjhwOSVDFTnKwvKAESrwsEBsjtE+kjuW33SSYlDy+YKzDFIIMKu2VPZ+4YD4o/KQgL5H88y34aPHhcpxOMXBO+/QBfeSuk4k; 3:yLNx3PJhubKwsaCzuDv9SBjVrQBz5rk5PKq6wCerOyRghtuY3TjUTNnIXu7ABPE2Zp5+epbkEekiz11951CZkKh7svN25Jq5ZvMmKm/u2spwrc8J6++OhWMhvlMTOGUL X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:PS1PR0601MB1451; X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1451; 25:Jf5EkihXMDES5avQom89eytXXaWYMSEQKzjqvrB9x6d8Aw7p58QpHX8hNW405Lqb29rEGZHEDoPZaTMpPvY6APsMEIdqba4xIDet48+JRLNsM6Wed6NHc++PI6so9KkDj0v64aYeIsIaxsS15b5aHQf3e1L5S93M29toHF6d3sWEZNNC0Ob1Zuddm0EA953cmllWsqNj4D5xMkgnf36TC+Ygb3gmiut4vEgO+INOhizxhgQJIYNVHt5/lrQMMaidnj9+ri9M9m1dNZi2kfKFECVxnWTG7ws/rg4fu5ELI58VpUNJdur5o7zrZRSZPlBb98POFPZeKJDwEkBp5bC23iTL5EOfdh9BvKTenRQRaB8NwjDUZi3gosAQmqjtGfcEj/dRJXCQe2h0YeRAQxcyJghVEHIsuJ/+Qhn1ilMOqzVtWW2T84jf6svpEE5rn+xLXTu7BZxRwmHOEZHJV5w+Y3O/YvcjMaHfn86a9IWYzilWUjJPX93ihJ7psQDR5sAZyGk/PnMLowmis8azbz+F39FxWuzmHK6y824hvMECAoYrf4H9InpLTwrh9FAu/FLCq8+1NNpbE/39IKhghb5YL+7PzS/xyY38Uxd1LaJWN+/UCrOxseV2AmpduID5Uz+0E3/zxOGxIAog/1wQCxa5TDAwwicL3onfnw2iswIFmC5msh+fPzixnCIhUm7LrhK6SBH/pC+p9U22ZbmJq2kDsw==; 31:NV34nTPMpEhjRIyYVDT9A2jBR2bnyd+RETzhaSgs1CL7e2BNX+LTfeRFq3eHsQ54bltCE6zuNsTex7qzA6ooQKH2EJY3vrFSj6n5hLjrdCySvvKejyRQTdHKPYWg9coe/eW60kswYZDC/Nk1gdaAJkFrV//eHok+WSI+jrzYNruuHYxaCIKwOxPNYiEJjYByKUkYtIk8sBP B+cIuUDegKe6OgDNXz1Q8+72beR1igao= X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1451; 20:zOwKwsNyS0hHmcruyE+Hpv+kaCcbRDBOtk8bAheLA9z7vYLoj+7c1wmb7gluGrlhC6xc2EC6eymOoRKON0bNDIA4AYM2O4MAhu+tvkHoC1fg4TSRL6oEiQPYs2JcC58ejuRy69yPNUPrwyNmsnLRJJdMNWiz91BW9P/ux3pRXpMvSVXikxsyPSpCZ/kYpWmFjhw7Eu/QFJDDgZSOuyriDLuEkdv9w+Enr9xzYE16Bt9IW0D9nHkreHcv4OI3c6DcGlZ6mh3kBPooqNGTmOKXiBmAG74H5xB+8bLrndTuE78TtZU89Xnv9YYNlNj/3vL25ywWtaozmQSAzN6aHe6HLBBnsfNnKp646Uoh4RH4jk2itkV4y4NvqR2W2nU6KMEwitQ6x4+RmMtgoBtI4jF+XhqCQqlZb4LTf0qZ8s7WBRtgesA//3NzEXkEDjMPRZocWKlzdcQgUFoLCWLEs8fpyCOAXkusQuHWpTtKoYZPrTY4NVgj4b4wz6vtY0eareX8; 4:EPp21I8D5EuAxVk3ogFF4jlYBkl4nKxt34XRM1rkFw3bR2W4e5MqbnZLKod18aureJY+mZIR+LSk6Mwu/HwSWLeYe0RqYBc1Dpl5lOMb0HY0YUc9e7aKODHbWvNcuMHgBJqFkoZ6qy32OpN7FI5ZCSdRXY4QrRR3HBED+xvq2J9dODMMMx2I3eHxfHxrTeLsndx5XurOvSR57GN/lA0awpr58WRBjmo8f913tCDaIeXIMAQ04YtHZinyU2C56kLOUSz7P5uHEfZllKQkgTJEW914SyqhEQCfFQcuB3TCyZvFeQ2Ei20I+oYjY2Qdilwui/Jn2RiJnwITX77fsxvxW1tDFc7tmaWCAtS5d0aAq9y1crVlo3ZGxRrxWU/YESUnl7N7tCCdgi/yYBSyVbrBuw== 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)(189002)(199003)(33646002)(586003)(47776003)(97736004)(7736002)(54356999)(42186005)(106356001)(2950100001)(66066001)(86362001)(189998001)(76176999)(110136002)(50986999)(4326007)(305945005)(101416001)(7846002)(53416004)(92566002)(77096005)(19580395003)(229853001)(6116002)(50466002)(3846002)(19580405001)(69596002)(4001350100001)(105586002)(23726003)(81156014)(83506001)(68736007)(8676002)(36756003)(2906002)(46406003)(81166006)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:PS1PR0601MB1451; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; PS1PR0601MB1451; 23:Fl9NI8M93Cx7fwW9JzX8MDezHz4A8DzRp6pLL+f?= =?us-ascii?Q?6Y56QJ9B2RMbD9d0KUgdozVjHGAabYbouSvsJyJdXbwu+JGQMMVkYOXnHkAf?= =?us-ascii?Q?PT3MJE6aAQPTHuDNjmTmSCq51452u9BrmLin5XIrysx/l7oPteFPKQjJoHRL?= =?us-ascii?Q?lFH4LBrZj+EXqudMPb1+uakKSYWkGXzOEx6IUkcIjaaWOFcN3LO++ccFmRcN?= =?us-ascii?Q?RWpnpm32Wb6n2mwsYb3BA2rnR6mG5Z+FPINLe5MDi2/K1bseA8viV1JyjPgf?= =?us-ascii?Q?LaxbbSXIZAA20UzKF8gYqMCK9urDxfBWc6rqS/bitt79lJY4A13FkOAbwXBa?= =?us-ascii?Q?buVgwukIjuTfk/dfT/UYw5patMHjBsbieEhkrfuAbm8CrPi9KGw1fDWW4L93?= =?us-ascii?Q?aE51hMYMuRuvA+8dno3hitL3tmR9jvuAh8MNTAHbEWEtRkTan3gRdf9eiftE?= =?us-ascii?Q?vAyI6tqSw6HmKAT1GyNOHhnO5Hs5ioorSvEzKHAOvvh66IqoQBEqfP4ohjhT?= =?us-ascii?Q?/oxM/B+fWKgLJShTVRsEBPAsFdsUjtbQ3oUy8eqhexcsoJocL5jLoFlPYDHW?= =?us-ascii?Q?ZP7q0uJGmFbG8kiM5NsJ0l41vBSgEy/YIObMwTiAhc77w/09ZJS4YP1S6bGj?= =?us-ascii?Q?inM1/lQC91KLZKXkEBZaQnpDz9QIqJ8EYqzRPlrcDPmxjWWuI0Zjwk5J/cDz?= =?us-ascii?Q?qPdQCluTWad6fn/1tlm9A7ZFWy2Z4WgkXHVmCSlZypoC9lEGQL+vgl3p0eq3?= =?us-ascii?Q?nTzngCMk3bJt1hVByKttK6kjmBcwrlmbDc+tHuM5VgxYUgi7WWBoKvwfNajM?= =?us-ascii?Q?405wtVgVnpk8EIxOXqQtF2rI88mJpLPf4kaH54QqzPgkBzcgKAu+aA1mbH8e?= =?us-ascii?Q?T5dX4EwLnssAj3VLIqHAtbWPXBlKR1Fvsq1BRLrCVUcRjJYcrH4kCBvsXozc?= =?us-ascii?Q?Nq2aVA4zSBcC9Zq038lH4R+P7YIEeuyWOBziXKTV9dOyUiP+1MictBDX6j6O?= =?us-ascii?Q?OjJV16juFYlpxDQDY5694NR/SxUO+cH+OQtgRni/f7HXQEmLCXNYbI0CCwLx?= =?us-ascii?Q?pgi+5dcXJH2aiYMxc+PcILbthbV6A1sWsOlOywHjrC4jCgECJeecHF+aLkZI?= =?us-ascii?Q?PwVsURk9DvRYCl+oKnj8LJ8QDB6brGleO8K9ulR/u8E940NvBaDcnkg=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1451; 6:qFAl50cKPPsBxta9kcG2GU9h3aEWPEextqH5q2QBf7/MR+VJHeCybSWWVJv3X4DbbGn2QAhlmQ6c8Yz6gC2tIOl6AVVM+GgBFad6PwlgVbw5OcvIH9S8DnQBDQDZGrpOb7DjeojcBLbzgvB21RBzawp5X/Vor2fabbsfkWFKqRJWODXv2kDlW/pZR7EJX7NX+OSkYzdjC7Tu/lF7+EfTgqRq2d4yOuD1AzPtnCeRL3fFmSNEacUZpymKLQCI69w6/7ob/lXH7MKqRYkMwY/dgj8sNz7zf5wZSHUJieWvyeEMN37HlYF4a8ENsX2kiywZygw2hn9NaIblNCyhQ4J8HQ==; 5:p88Adb4EBxn736cG+e6hs7AdkKHMLHmRWI6+P8g9y0FzMKo++FLD1r1nd8Ix8BHZex2nfDVDzC/PWngzd9HhK7XqtMLRlMhlQmylXwCu23AzNKiy5Hh1ermMfiUe9+By3EciroM+O5dOPkcMQ20o8g==; 24:T9rkctvZhizWeBOslmrY1YCKVJ988rRWGyaGBRiBAwFNZRAmdMgPCWlnVsw28SvDz286ziwbfagflyOT0rzfbfzZS1e5XLGaADfPbCCynRo=; 7:BkDFF9tLNl5Hv8D7NohS3HN58yFcrffz+k+EB5h6nNjSfRGU7OS0MhXnPHPFoVFsf5PoQN6Vd/ThZyd9wc5W/ipP4CWUADGMepzPF8C2O8NPfJAaDPmCh/ZzOwUiBMGmtlkrjY3Qh82X2M1YH9GtImMtXofeCbyT/6FddfhqE5Vb7htyeIFE3Cp26RMuWcHWsJfAvlnFRiKVqaNW02BYTJLpWeKrOtyw/YlmmwHHQme4pZwT3B4Eq8pCt1GZykJh SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1451; 20:Q/6MMKmbYEqRLHir6tu5/H9Uvl0RqXK8QBvjtaF8Sog33LF7kVKbEHSWg5/wsJ34TCdcdrGQqmugmV+RE0HEaNtK6PjMCXZzltwsGnw2auCM2IWQSJ5t58wOVmSJhy6x8f7i9x5iiD1tiEbRdToJhpxkKTxevp4z5BtraDEvc5Y= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2016 09:25:40.2263 (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/tlv320aic26.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/tlv320aic26.c b/sound/soc/codecs/tlv320aic26.c index 2c904d7..14aa96d 100644 --- a/sound/soc/codecs/tlv320aic26.c +++ b/sound/soc/codecs/tlv320aic26.c @@ -321,12 +321,14 @@ static int aic26_probe(struct snd_soc_codec *codec) static struct snd_soc_codec_driver aic26_soc_codec_dev = { .probe = aic26_probe, - .controls = aic26_snd_controls, - .num_controls = ARRAY_SIZE(aic26_snd_controls), - .dapm_widgets = tlv320aic26_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(tlv320aic26_dapm_widgets), - .dapm_routes = tlv320aic26_dapm_routes, - .num_dapm_routes = ARRAY_SIZE(tlv320aic26_dapm_routes), + .component_driver = { + .controls = aic26_snd_controls, + .num_controls = ARRAY_SIZE(aic26_snd_controls), + .dapm_widgets = tlv320aic26_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(tlv320aic26_dapm_widgets), + .dapm_routes = tlv320aic26_dapm_routes, + .num_dapm_routes = ARRAY_SIZE(tlv320aic26_dapm_routes), + }, }; static const struct regmap_config aic26_regmap = {