From patchwork Mon Aug 8 09:26:17 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9267425 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 EF05260871 for ; Mon, 8 Aug 2016 09:27:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DE49126D17 for ; Mon, 8 Aug 2016 09:27:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D266327DCE; Mon, 8 Aug 2016 09:27:09 +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 801BE27D64 for ; Mon, 8 Aug 2016 09:27:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752005AbcHHJ1J (ORCPT ); Mon, 8 Aug 2016 05:27:09 -0400 Received: from relmlor2.renesas.com ([210.160.252.172]:28825 "EHLO relmlie1.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751985AbcHHJ0W (ORCPT ); Mon, 8 Aug 2016 05:26:22 -0400 Received: from unknown (HELO relmlir2.idc.renesas.com) ([10.200.68.152]) by relmlie1.idc.renesas.com with ESMTP; 08 Aug 2016 18:26:21 +0900 Received: from relmlac2.idc.renesas.com (relmlac2.idc.renesas.com [10.200.69.22]) by relmlir2.idc.renesas.com (Postfix) with ESMTP id 4A1784FA67; Mon, 8 Aug 2016 18:26:21 +0900 (JST) Received: by relmlac2.idc.renesas.com (Postfix, from userid 0) id 3F24B2806E; Mon, 8 Aug 2016 18:26:21 +0900 (JST) Received: from relmlac2.idc.renesas.com (localhost [127.0.0.1]) by relmlac2.idc.renesas.com (Postfix) with ESMTP id 38E802806D; Mon, 8 Aug 2016 18:26:21 +0900 (JST) Received: from relmlii1.idc.renesas.com [10.200.68.65] by relmlac2.idc.renesas.com with ESMTP id UAL18575; Mon, 8 Aug 2016 18:26:21 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'";a="216937962" Received: from mail-sg2apc01lp0247.outbound.protection.outlook.com (HELO APC01-SG2-obe.outbound.protection.outlook.com) ([65.55.88.247]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA; 08 Aug 2016 18:26:20 +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=4ZA9wmgOB1Lzvv2kmS9eguxetOEOLyMelNtyFtg2HvQ=; b=PEBdeLwC6TcBxElxvM0HrC2KZx/t+U1b3HOmQikb6ZzEngQ1xgL7pZYGJZs2Q4jxdhM4VTRGS07ie1pQ2iPBtP65/UU3pY/5adjhMXFNuzWzQ/D/fMrEOqu+XmjQo128vdoaAjeM0dT/JJTMHIqbQ6REY6uco1l20biM599jaYw= 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_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.549.15; Mon, 8 Aug 2016 09:26:17 +0000 Message-ID: <87wpjr1uw0.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 125/159] ASoC: codec duplicated callback function goes to component on tlv320dac33 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:26:17 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: TY1PR0201CA0013.apcprd02.prod.outlook.com (10.164.90.151) To SG2PR0601MB1453.apcprd06.prod.outlook.com (10.169.106.19) X-MS-Office365-Filtering-Correlation-Id: e2895353-1e95-4814-42c5-08d3bf6e0d14 X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1453; 2:sS84WlNZxgZBRd6k8a0vWkVpXqPJz4akAXVFCgojhW0EYL2jOw9pNa8u1C0vjFJOJ1Eipc7r1Bt94on98Hoa3AVCG3k/pN9OX0a8ExrrqcjDXlpqbCCPk1R3hQmzAHcYicwHclAcGInv4OReAQ0AfBcshCBpMsxSDIysUm0WmuNpk0nyLtZxnX7MO+gYRekj; 3:7vSUeg4WMw34fCQnJXG5sqZFHKS441NxO055GcvXwhBWfHkhYjVMByZ+7NoNCVO/745qG/Yif7aicjTEALjlsg7I0uVidhL4tEwZ18rwMv8oZTkEQqi5ARyL17osRxE1 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SG2PR0601MB1453; X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1453; 25:dh2IgWCP4wpWO+YiVtUKTjQz0c82To97B39yKODaDCWnUCsy5P/kF4ZdDt7E8pA5AbNe7Dwdt1YJYDyAvwkeQp0sEhMKXRHjoVX32UknOoMwGrUzXiqTFzWROW0RWPrhhlH1YuTu3I3L9QAIiOOLANzGniS67UMQVBUNS42YRsNhzdDx6RIgPFV/jk0wBje7S6oH1BFCbpeuGKxDe7l/HHKA9x9ssaiYacUFW+stY7dlUwWSYq3b74P0EC1t6JlDizZZlBtNSxriGbsJCqOSD3XonQYvyzzDhX0xdKaMWBygTr2CCjF4/F0vUzdGkU2xZ2N0Erp4DaukeRApwLMju6CaPTg73pvb3r+M65LR97rTyYi5T81p2ae9zv01MX6nfpPixRJbmsLfQ6rIo7MthzuMlfkqqXfAgmJxY/wV2aOzXVUx0u+/tOyBIcnp3bQiEECBGWVyu+wKMlUaNYEAX3Stb5ocw2KPUDSzyLWk821XdhryJM1VySoShzW53NptwYhwpivkrpZdXl0iKru+RRTAOZlH2Sx78Jt1/n2alDZRxTbyjzk4GwOSc7etm0EOYcC4jGj/dKVnSZ5QiDFGyF5Y5d90f10Xzjb/hVOOrBuYspHbhCTkDUn5Y+feIi2dinJD1glsRcZ1zQYcUHoyO78Qc8I23shodDTPW7VjDLeRD4vNxR7BQqpi/Rf+95Pe4ERyCh+T7LCMaXY67dFQIQ==; 31:PZ6w2LYpS4UuO6K+3USSTdiruY+j3iFFjEkQmzdliM7lDloGFJWtkb0hmdYzGWUp+AkgK9DUIjF82nE+6b8DTLSMEkwgVPjM48EjVXV6chMO/ACC7iA4yMjMhbHcKf1dlM1TrgUKjkLeJ/jJ0V88p/vQTayOZrx+n77o3gowHVHsmG2osltrWTWwxNCLiZEgEj1OtQmmiy1 cE+9HOJ3zXgf6mcoD1RsYHGAaW1UV1jU= X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1453; 20:cRFoyte79rruHfi6ljhqKeKzZ/KKwkhOSM4v5TTh3JYV0acnBWyLTwB7JtCulPi7obzh8M4MoIDqan9msh1Y2DjaugkG22Uj1yHARP9S25AfzypPQk7TH4zo3XYYfoQFR76jxEdrl6rF3+yIWCpgv4ammZsQVJk+wcy07Ue6z3np5LKXi9TxeLBbt6XA1YPVy/uZ4emcLn4NyWyyTvMNIvAoOAY7lo7XSkFoNq0hg8PbMXs7h3OZrR7Pe28rYzy7nHdFw1AK4DYTuWOzBeQijyjJJ9Sfu29EiobIMIedagFAYHrKv3lGOtC6ygrjpQsg/vQQZqQRUpHfsqZktX/0kUfRPmZ7lg0qfwNxKnxz6yegCaQPlBH7EQn5r7lA9HtmYh6FLuwlNp6gf1xkPup/49tf+eO4ylLVeQyGsj1Omh6s2/Punel03zup8SPXCq+ZoSw7zZ/Yl6sZjOLXuJUxq6g+idsqXCktkOTjoGPdwi+Q+LYj/37x1pIss3WQhLHn; 4:Af1tmRsgI9RxDKoJttF1GVmcsxVi9WdKfX6tqjOn4DojbLlp7fuauEVO6fEp0wYG0+6FyVN8bJVyPxPtREIYIscb+7uAIgfj5paQEpWRM/rgQKcyMTMD17VtlOfga0ejZMDNDo80n3arWR2eRZiqz3MR7sFCAPncDGznOuVc4DcIiNDcaG6iz6wRRWkw06zYVwAjgnkQNbLvmqQrnLPi7zMgjwyCAPy/MJ/t1KZM/3CI+NmpjoKifZSEEq1qeFTfz4zz1fuo+nofmAy/cyhDixCL+Pw5jOWSe8lxUfBCDZThxIVaarOYzSTgxAIpO7q7dkY2Qk86wAQZF8m3tPT15xXvbqEOH/7dN4yPtMbly5zk5t2LbFgxssde3WikgW5T6QAoZaATpv3dhguRrmZvNw== 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)(76176999)(8676002)(53416004)(50986999)(54356999)(106356001)(229853001)(2906002)(6116002)(81156014)(81166006)(4326007)(23726003)(77096005)(42186005)(2950100001)(68736007)(47776003)(105586002)(586003)(7846002)(86362001)(36756003)(66066001)(7736002)(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:nswGM7uDeczGd3uOvUrkHxB/UVTpnZVMRIL7BnI?= =?us-ascii?Q?eIGi0y9hiGjjS9Pr52nOGdvnr0zw9rIF26Z+3mlQu5flYfdylUzAyMWaf7I6?= =?us-ascii?Q?mR1c1w0lFIfkwaiOYph5p/AcSXzNwmht3WGc+FWIPA02ASPwieBkVKEAjVP2?= =?us-ascii?Q?1vqPvZ9skjFyxtYYLkZBH/enErxzwiFO7TmXhsiS4/pRdtSc59/rgGl2dTLS?= =?us-ascii?Q?DbZarx7hzKSH7631Mqx2W6miw3LsCLq1nnOD6saB3MO6gT72aQasBRjDP2Gf?= =?us-ascii?Q?Nl4Z/JEL4fMzsSe2BiAZBYXT0S7z0HuqR49Ji2sA789Af2YOpLL5pe25111Y?= =?us-ascii?Q?OPvjqGd6VCJUyYnLpmOji5GLCUoL7T3LaYTR9EO++HVO4xwoH3LYCWrQw1bv?= =?us-ascii?Q?U0P5oVkJKr1DbcU+Fcn/JFFqFQPd608n9cu8DnEvBJixK/n7KqBfgD+6L94j?= =?us-ascii?Q?XMl/93V8qFy7IUOFipaeIpyuli6zUo1TIoYGYexCokHysoWvy6DoTRq9stUd?= =?us-ascii?Q?FVehn7dLoreoJcBFKf0AQxptjRFJUwAGuL78XvvyL9HMgTUgVlsVYYvUVWgI?= =?us-ascii?Q?L9Ne9Mo7DDQh9IMIGsxRSe+D4VrjSa3XGbhBLgm+ZZ4uEvWOoV+SBpvrYxun?= =?us-ascii?Q?nBUgR9fnOrDdqLomnYuRIpnX/90Tik5noaqTwarC2I+pA6NFux+PXr+z+uGk?= =?us-ascii?Q?Ah/VNnZp4xxC/BooeIWCC1EkqIHP+P54J2U5s2xeL5MZinkkzmZ5jAHUpBZ3?= =?us-ascii?Q?PUTDUyVfEwo1xnL/7dDKp1dVcu/ajGDsTCF7rJ7b89b4HCC41boSNDvjvbDT?= =?us-ascii?Q?2tq2+lYiyELm0syFu9ItCIxYmpZlWLuJkdtSQ+z7d207mM3UA9voNqVscX7m?= =?us-ascii?Q?dCWUgIO1/bxpj1nAu2dGdvmEr+sbBJ2nwIEojrM54jBDkPQZaJwd/WnrCM+5?= =?us-ascii?Q?802i9a5edpFMIdCiZWEZlF7JrlkXlJTAPogQ/6NjZ0PW1I7VkuVoADbX/Y8X?= =?us-ascii?Q?oXHKVe3aOiiKmHJCMVij1mzQxr2YA/DlZ3cjED8IsEOpJHXvBUQdJKHYcBkM?= =?us-ascii?Q?AqntkDPcKHHP/oQlmKfbEYreg6jfjgg4oMGWflo0j6uHp1t69bSBGQcSE2hn?= =?us-ascii?Q?iH/14gNYXxf3ROzUYi0zk7Q9/t2AEyWMb3ciE1DToF8Kn/rjHonaKSw=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1453; 6:jN7d7Oy3xJlWplAtiI+hrheuSPbct+Y76Mq0T+/RHgQqAkCc+isXx6y2C2jyRPclrGjenIYNO59wK3uWzqis0b6e14zydwibdyQo1M3mHQ0nGe0erEKyttKMtbGXIkMvaLas1Q/BoyIYSBZZPllZohCP8y6PDf77XtlHEIwWiiUYqH08h/b+W7NV5RE2NbUaSHg9mBfBfxsgxaS2ixtPY7o0HzaNxbQtlukpo3C2tBvCMywm7AsR29dmVKZp9Zew7YSkFcM0utEyyXP1hsHC8eEtYnlVyb8J5YQimtfiK5h0HSdS2Y8hQSadWHandLLg5BvKpduz1ljmndsIOfJ1vw==; 5:Wi4D/gljlnLem4W26CfM/1kN6h7OgI+F0fIjGfTYE7bz4SykK01xyar1Fu3sWeUkr59ijbHc290DvOsP0z0oZRgw44t4Po2ghuM4zWddlyp6N0OWCGeo76+c6ffk6Al8QI7SytCa5exZ5s5PBC4ulQ==; 24:5b+OX6NtN6pX2HMWRwgFp90sG2Nenddy0yqDTm9wrpwFm40Yzqj7caarzagb8TQC6s688nWKZmKxaD2aS67ZxdGlxj3wd32mUiN7t5oX+UY=; 7:+6r/WwEqlTdXw2RCGcRMKO1hpaq3jvaeBv6WPusUhskCmIMC6MwX2LOmjDm5b3l2ihecC3Xyi3GxGFt31HkBLcPNryhraD5v6dNFQtTIT7/Mcnmov0OuhaBwviyxwW1/ujxcQlqxX3bAZKpRpBGqyVIR3F2QmEM/vU6y8dFB4woWj9P1ojPTEaqx9REcLarZwNbPZ+rAYLnE9O3qyFKu+Lcda9dGMke03Cm/A0ZWapitAgujDRD+EgDWx0JvS+3m SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1453; 20:C7RUB0ef0EWRLLvSDhGawPboU9d8N4NdQUy9yjc39ZlECM3C5Ix9FRC+N4JDdy7QOOtN+KoYPho0sMaPu6AYu+j2nY+QdlKagcqcgfqYMYd6edKPEcG7LKI7V/EH31HEpBMeMcak19Ig2NpdCn5x+50wYiT101gZWc4km3R5wh8= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2016 09:26:17.0326 (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/tlv320dac33.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/tlv320dac33.c b/sound/soc/codecs/tlv320dac33.c index f7a6ce7..d64eac7 100644 --- a/sound/soc/codecs/tlv320dac33.c +++ b/sound/soc/codecs/tlv320dac33.c @@ -1453,12 +1453,14 @@ static struct snd_soc_codec_driver soc_codec_dev_tlv320dac33 = { .probe = dac33_soc_probe, .remove = dac33_soc_remove, - .controls = dac33_snd_controls, - .num_controls = ARRAY_SIZE(dac33_snd_controls), - .dapm_widgets = dac33_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(dac33_dapm_widgets), - .dapm_routes = audio_map, - .num_dapm_routes = ARRAY_SIZE(audio_map), + .component_driver = { + .controls = dac33_snd_controls, + .num_controls = ARRAY_SIZE(dac33_snd_controls), + .dapm_widgets = dac33_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(dac33_dapm_widgets), + .dapm_routes = audio_map, + .num_dapm_routes = ARRAY_SIZE(audio_map), + }, }; #define DAC33_RATES (SNDRV_PCM_RATE_44100 | \