From patchwork Mon Aug 8 09:25:57 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9267427 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 B4E1C607D6 for ; Mon, 8 Aug 2016 09:27:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A52F627D64 for ; Mon, 8 Aug 2016 09:27:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9A17B2808C; 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 20D7B27D64 for ; Mon, 8 Aug 2016 09:27:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752168AbcHHJ1K (ORCPT ); Mon, 8 Aug 2016 05:27:10 -0400 Received: from relmlor1.renesas.com ([210.160.252.171]:26699 "EHLO relmlie4.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751951AbcHHJ0C (ORCPT ); Mon, 8 Aug 2016 05:26:02 -0400 Received: from unknown (HELO relmlir1.idc.renesas.com) ([10.200.68.151]) by relmlie4.idc.renesas.com with ESMTP; 08 Aug 2016 18:26:01 +0900 Received: from relmlac1.idc.renesas.com (relmlac1.idc.renesas.com [10.200.69.21]) by relmlir1.idc.renesas.com (Postfix) with ESMTP id 8444E51703; Mon, 8 Aug 2016 18:26:01 +0900 (JST) Received: by relmlac1.idc.renesas.com (Postfix, from userid 0) id 6FF728002E; Mon, 8 Aug 2016 18:26:01 +0900 (JST) Received: from relmlac1.idc.renesas.com (localhost [127.0.0.1]) by relmlac1.idc.renesas.com (Postfix) with ESMTP id 6428B8002D; Mon, 8 Aug 2016 18:26:01 +0900 (JST) Received: from relmlii1.idc.renesas.com [10.200.68.65] by relmlac1.idc.renesas.com with ESMTP id UAG14273; Mon, 8 Aug 2016 18:26:01 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'208";a="216937942" Received: from mail-sg2apc01lp0243.outbound.protection.outlook.com (HELO APC01-SG2-obe.outbound.protection.outlook.com) ([65.55.88.243]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA; 08 Aug 2016 18:26:00 +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=zoXH1OlF5C3HflMamvhJv9NQn/Tte3lU/COs9lYeHCQ=; b=P+qrzb5g0oStPr+QSFG2grX0Ir1pdgznNfEgRZI7kIU9xpTvuTmeCDZQ3j1Um+AHNmSAW1y3oIDgjlt+i6zpcaw00G0n2tCEL5+LFTK44+zXJlbmKAeFHPyaYc/dAL3UDTyRawtdb0Uv62YfZJMj0M3MimzxanZnZVIU/7Qsr3w= 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:25:57 +0000 Message-ID: <87y4471uwi.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 124/159] ASoC: codec duplicated callback function goes to component on tlv320aic32x4 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:57 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: OSXPR01CA0068.jpnprd01.prod.outlook.com (10.167.144.18) To HK2PR0601MB1443.apcprd06.prod.outlook.com (10.165.182.149) X-MS-Office365-Filtering-Correlation-Id: a21a2f44-b910-449b-78b6-08d3bf6e0188 X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1443; 2:d5F7fTAvdYltuVB+XqIN3QK9YwxjhG+y9n4yNLQlYkXbqSG2Xl1Bm+325YVpF+Eu4FcctZaOx7FYoHY/AX8PxJr8iT7mpcgDZLl2C7z0N7XWH521Eypldel3YtdGjyxLtOqBmAjiApM94jZygazX29kFVG7YYG28PIwcfQB2qEWN4wMxqYypILoF93DPgR7M; 3:EREMjZTUXeYG78z5aOSq2uR3V+fal33yop9ovnk7aFlRbmijzpTLC+1NAlr1ZXOetYT+6EKHJ/ExBp/XVGSe1AJGSPWyxPk5p0QgmA8BA14cu7aCIyGGC+bAgI1uXEI7; 25:OFUx5VDbuh49OYX5MJwYQ1nJsQKrDxEkEIz6Bq7Xwd2M/lchM8DmeKiSf31SKv1om+0vS98GT5oxev23KVkni8WmdU+NzGLqvAIEkwJsD9XQbWVcQ5XjCk9kPU5B+qPP8ELSzQYRuVPftXvJg22CcYXXGEm7JZ9gBd2+rUgas7rnOP3G6dMdm7hLOIbvzr9ZCwqyH7yRFylVWYps+IBVJx15XKP4Bnjg+VkHoBC5HY6xxXKesd7bq2KT+dNGxNAXS8tUqU/ppkKuH3481HUDq6NiXZLodTSFrNh/Ta5KZsUwltaVfkRNpT9oMIgyX3Juyn4tqwZLMgRKVVAK9zOIelDKJgp+WqKao91E+CYZAU1KgDf21iSkOMPWz9kyMJ7yyLC/b3BrPK6lUiwMqM74YzneWLzEcO0VXP4wHTmyo0U= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:HK2PR0601MB1443; X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1443; 31:0O5flWh+8zW5Bqrj5MEg7Glojknh+OT1x7p7A65T12Gy8vw/0bL4H0kackV0PBsVvrMrs/I5s+2YlKAdVOEhJl3R7uBO0/aEswJkfuaX9D41qnBd4TuZ2WxnSw7zoklrZEHL2gJhLxqMMuyySMtwfeaGCkw9GV5YwYfeqM9AUNNJqt5aa48MuPZjmNOVPBFYAugq5cesO9u3DWR+Ulj9WaSTbAWXgzZZgSieNNPlpUE=; 20:nFkHE+wIWBAUXXafXRGQsdjBEWKFvNn1rb+/NYx6i8EHGzzp+ZaUl4mvUb8gg5QzuGB9d8YqdMDlGzIGQPvs0GmyHwwU3+bLLa22RtG1znZ1DZD1tccT3b3YfUwjPNsk68/TT8pKP2fKkZeB+9zIWtOEhoLm04k3WwhGGZ3gT0TU+2xWQOEWkO7wQuMcJYBg01Emw7Eza7dInbNqnFxwrYyzm+RUL+7ItJ6OwLFc+sYiE80IE2QgywwC51lVpt32KMjW5z1mUSO3zhpNuobIANxnDvtINFBF/xovJOursHelR/3/UJszJGRE4Ggrb1zYDwAsaAe3IvFxAZ7v6fvLead7zp92xWdYJ1PqlOApS2tMbNWgg9s4RfJ26LgG83XPtLl4AUcnby+s6ZLG9ToburQLIGY0cefy/WOmGMnwVSyH+CMORtWYY77Wba4uc7Be2YEyHuD4pJAk1GZj2asxgragdZOj9LOj+GEZuiinh5LllR5DcZZyf6dSm3biNnct 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-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1443; 4:7hn5y1J5afqP5IMGJfW/v71gWeylAx9xLzVXpB56SPsefLUXDmBfivkKL7vXE0Bp2F/j8MS/5FmCSHbcgGEOUgNFGEE+cef5L6AmSG837FDbamoYlh7bmfD4JxUhgj8jNiwU7rxZZhvp0udxr3t6YNdIyHndb89w+/w3CyK5sryMlSW5lCx+fJailv2ZCm3aEaQTQf3e7z02aNaWLBcSFMgvJyeQpnfzQZCs8HpGBKvyBjSpFiS60LO/oVRQtgonskQN+xoo/AbzxSYl7Ar6cZV5HrnuiGtZVrIAP64jxzwOp5ucqCnR0PTPrFoa1sHQQUL4G2dzFPwQBVvG1A6lCmXGj+jboLLZWt/SbG2PaXIBcAwNdPq4ozLtmgGUZSjLtNH2D7pISWtP0BsCgQ/KzQ== X-Forefront-PRVS: 00286C0CA6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(189002)(199003)(50466002)(7846002)(7736002)(305945005)(83506001)(86362001)(92566002)(76176999)(33646002)(23726003)(8676002)(4326007)(4001350100001)(2906002)(66066001)(50986999)(53416004)(110136002)(189998001)(54356999)(46406003)(47776003)(97736004)(81156014)(101416001)(81166006)(2950100001)(105586002)(19580405001)(6116002)(586003)(42186005)(68736007)(36756003)(229853001)(69596002)(3846002)(77096005)(106356001)(19580395003)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:HK2PR0601MB1443; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; HK2PR0601MB1443; 23:lcg0+t3JVOAtt1Ss08up13pndAnID5sCZrmjwh2?= =?us-ascii?Q?oACWTQZlrs+qHUrFsaiX1jUMCxEfMl4vnbyNgKh+NX6VnS3sB7EqInmZGI0Q?= =?us-ascii?Q?xOoS5CKohh/HTDY1g7xQNkVKeJPmKrTL0pSTCnfbzQ3+WFlwoacls1fi+PQm?= =?us-ascii?Q?zZsjoLAyYb66f2qeen90DLHNtoSQQnWLKtIP0YcZagE+MPgVzEtQ2NuKOohk?= =?us-ascii?Q?k4We470MH5pOqo/dqOCwDcYv2r5GMmreKGLLoTT6SFJnUGHEWM5pbQsapJIJ?= =?us-ascii?Q?E3QgYv3jwAcLUQ17hoQQ1cgkQQUKo6kdOwqQGoeC4zKm9Byq6/X7ui/oi0Sm?= =?us-ascii?Q?CkdocLGMEEhBZEnqq+UHlPnLTqmtF1Bc2lo6NF6e5GIb7sx/apLwzxY5a4YB?= =?us-ascii?Q?lPZYMzyLRqSxhbaeOpMdB1s3IfdH/svFcuMg0v9VhqzbIzWwaAflShNc0s89?= =?us-ascii?Q?FvGThPIED8x16hz7JK/G3p2YrxMBJ7yrCm0yMnDpf5i59JSq9NkSGXcDCGj1?= =?us-ascii?Q?IfkgWoaa+Noj7bN4Nl4jLUx+mbmXAg4T5behza5fC4UYNVnlD/Bq58kPIO1K?= =?us-ascii?Q?bQmTkLQ695+If3bTpHqIbndZZPty7GkILMqO3pKNYk0VGlSNEzMUbcguR5c0?= =?us-ascii?Q?iStMY+Gxo5OCh03DsFACJ0Bw4KyML5TzJ+U76unfk2gi1enviLGl44MxjW9G?= =?us-ascii?Q?PCyC9PynyjYBdP1g2aAoI0zxPhDVBhFNG8Q10gyqa75R+/xRVCuHKFXahEut?= =?us-ascii?Q?PZxfjhlE+LmwNFqvwb7p1Bqv7XvdSbQZWF9+IUl4E1uyXm3F5eemCX71/Wx2?= =?us-ascii?Q?1kMpaU94VsWv8uVz9RahrSc7M14AGCgGrIeR1KHA2oeZhcqZZnavGIMUzMae?= =?us-ascii?Q?aOuCAc76HE0/9qmJPWqVSqW/6n5TFukP9Yu75nHvihR03ciX/8OSCaP/oOca?= =?us-ascii?Q?jeMYGH3MMF7rghLGrnPG+Xw4FuXOJAdDr0tSaJxG64EA7Nz42l9naqgH/+PO?= =?us-ascii?Q?dUT/BPi6fyhRPIjXGMGaMRNj9YxcihTV+H+XRp0yNF2XZT6ZZC7ljPHlvm/Q?= =?us-ascii?Q?rCOdKdHyjV7hQwVAjq3JB1T9fwlVxGKxLb8PmcyeEi932qpf5TsOTULF26m+?= =?us-ascii?Q?L0bQzW6USO7I/VV7TUelqsKoT8jdju5OwJ+DlT51p5d3gsywpMm+AIQ=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1443; 6:6X/Af0Y3HmiMYuVv28Qknjo3i2Ssb6j4d1PDzvmCBH6PTH3pesuM9iLmQtcWefxf2vuSa9YBKEQTde5vBZp+xno2ZgjhC+q+QFizbrRzSS1/oJAdiGTI+YdqF4tCyjqghfHUZv28SbDatsiRDNBYXota4RRo2nTzMotxAIHgT8ef/t630BmzJeUv4mNxiR6DKz8ekH5tVhh7retIK4NER1b3uZa9NV9mkgaVnMRFBGWOK232fElHUNoQuky5flYAfSi76pEkEF7hv2oGDzqqrtU2tDk6r5NN36PXwtvND12nIEleNqQKYZo8hnUYnZkJIZoOkdYp4EjGuTNeOkVu1g==; 5:eLpcqXRwy0Z104G/kyTMnfQb9pN6lHZ04ahCvv8cGtdcsXLLAB6tPnlbUEkJzjwUo+19Nlnm6L724OCdlQGZVrvRG/4AuyJ+6dIpwyDwJcSRFEUgBaxNwKBorrgYzfUs876v5B8k7IfXEKYDXcLTBg==; 24:WC7kAdJV8mT30HUP4M9G/61SNTWoWjW7y/Lup3YDkxMLB5Q0/8EFDGgEOw5WrT3Tc6In7xFfwmE31wmm/BrxWPZglOSqGBAoRGiVjVsZSLk=; 7:4zPwmc2zZlr5Ujql+V/bqAg1/7vEt7kiCzkcyaqYGfhR0y8YAbE4mF8YuZhcdI1exvo5XPP4lTRsmhM3XB3KC6lL5FeckNQkHsz5aPjau1kMlNJWrOLzeYsAdvWVX4A0Ea2CVQVHU3Gu5KR9PA8cAj7h5zKNeNkWqCHJaXvJzdSWCzcANaA7ncshZI1ukVUoHHzWSRfOeBS0z1XL37Rgoh2kl5D5MO9KLUSNjgLCWE5DfQyNsw/h/Wv5k+zvqPZm SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1443; 20:xrwizTDv6TAQeogHrB6SC3j0tokuKOeI1BW9JCQft/lFmUam4yd5npucNyWDl21rlIVQqHVQ6sx61ngdtep/FYcE3xAAax6uTF7VALrs1wj8oMDTNDwak2Fz1XSkXpSKF/ENH4nsJCbsvU/n6aTc19qT/INzIW7Xks7PEcq3ITI= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2016 09:25:57.6942 (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/tlv320aic32x4.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/tlv320aic32x4.c b/sound/soc/codecs/tlv320aic32x4.c index 85d4978..28fdfc5 100644 --- a/sound/soc/codecs/tlv320aic32x4.c +++ b/sound/soc/codecs/tlv320aic32x4.c @@ -797,12 +797,14 @@ static struct snd_soc_codec_driver soc_codec_dev_aic32x4 = { .set_bias_level = aic32x4_set_bias_level, .suspend_bias_off = true, - .controls = aic32x4_snd_controls, - .num_controls = ARRAY_SIZE(aic32x4_snd_controls), - .dapm_widgets = aic32x4_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(aic32x4_dapm_widgets), - .dapm_routes = aic32x4_dapm_routes, - .num_dapm_routes = ARRAY_SIZE(aic32x4_dapm_routes), + .component_driver = { + .controls = aic32x4_snd_controls, + .num_controls = ARRAY_SIZE(aic32x4_snd_controls), + .dapm_widgets = aic32x4_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(aic32x4_dapm_widgets), + .dapm_routes = aic32x4_dapm_routes, + .num_dapm_routes = ARRAY_SIZE(aic32x4_dapm_routes), + }, }; static int aic32x4_parse_dt(struct aic32x4_priv *aic32x4,