From patchwork Mon Aug 8 09:27:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9267781 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 2871E607D6 for ; Mon, 8 Aug 2016 10:53:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1A03E27F8F for ; Mon, 8 Aug 2016 10:53:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0E9D52808C; Mon, 8 Aug 2016 10:53:18 +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=-1.8 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED, RCVD_IN_DNSWL_NONE, T_DKIM_INVALID autolearn=no version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0444B27F8F for ; Mon, 8 Aug 2016 10:53:17 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id D0F5E2680BB; Mon, 8 Aug 2016 12:53:15 +0200 (CEST) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 06849267131; Mon, 8 Aug 2016 12:01:40 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 3A53A2675AB; Mon, 8 Aug 2016 12:01:39 +0200 (CEST) Received: from relmlie2.idc.renesas.com (relmlor3.renesas.com [210.160.252.173]) by alsa0.perex.cz (Postfix) with ESMTP id 6242E267110 for ; Mon, 8 Aug 2016 11:27:37 +0200 (CEST) Received: from unknown (HELO relmlir4.idc.renesas.com) ([10.200.68.154]) by relmlie2.idc.renesas.com with ESMTP; 08 Aug 2016 18:27:36 +0900 Received: from relmlac2.idc.renesas.com (relmlac2.idc.renesas.com [10.200.69.22]) by relmlir4.idc.renesas.com (Postfix) with ESMTP id 16B0959AF6; Mon, 8 Aug 2016 18:27:36 +0900 (JST) Received: by relmlac2.idc.renesas.com (Postfix, from userid 0) id 00AF62806E; Mon, 8 Aug 2016 18:27:35 +0900 (JST) Received: from relmlac2.idc.renesas.com (localhost [127.0.0.1]) by relmlac2.idc.renesas.com (Postfix) with ESMTP id E7FE72806D; Mon, 8 Aug 2016 18:27:35 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac2.idc.renesas.com with ESMTP id UAT19109; Mon, 8 Aug 2016 18:27:35 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'";a="217448013" Received: from mail-sg2apc01lp0240.outbound.protection.outlook.com (HELO APC01-SG2-obe.outbound.protection.outlook.com) ([65.55.88.240]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA; 08 Aug 2016 18:27:34 +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=q3WcufstPj78U7b+WP+8pEscSL0TtJqNN0UUQXidd9w=; b=WfuT6JOqWopXTjXXlYLPrUwkqVyXQRDZFhZHPad7GglsbBbi9l1BzT3fJ9mg6nz3RGQ2XYf7hxlmLmymE6+fgVHM5IFv22xcVRSvayISmIsqWzeYIGsEyMfjPHHww4+RqqK7P4ZdkmZlAWU9tj9aOVybJ/qhrPABXCMty6DP8Xs= 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 HK2PR0601MB1441.apcprd06.prod.outlook.com (10.165.182.147) 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:27:32 +0000 Message-ID: <87r39z1utv.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto User-Agent: Wanderlust/2.15.9 Emacs/24.3 Mule/6.0 To: Mark Brown 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:27:32 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: OSXPR01CA0054.jpnprd01.prod.outlook.com (10.167.144.40) To HK2PR0601MB1441.apcprd06.prod.outlook.com (10.165.182.147) X-MS-Office365-Filtering-Correlation-Id: 71be54d9-9901-473f-9127-08d3bf6e39e0 X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1441; 2:aprdHi5xlghFGRlePFHOCbgv8NpUSYKD5J92bqA9e22Lx1E4tPS17IyWr5jLRib9zhwAtyq4QtpL4JgDCL6IZskCPgygxXwIcHnpAqpw8JqddToqdONiG//HNTQXzc/2wCOlm9D5tgw67+u1CMM1lvKMoNqvTy26SEEYGEziWSVczG3GnJz7SQZ3voOOFQfh; 3:+bv50Z2QW1cUkhCRnjxJtdNN9K/zh4cyyHjYLixMMZB34Zkf6Ys7y8t8pmcSVHUi9eJn7XAsG899nPxnk3D/04eQgjHDlqVPxcxG9Ia+ervGy0yPC1INaaLhB7uxtCLk X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:HK2PR0601MB1441; X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1441; 25:ziAi/kH7JRIdE61S4KyN4HhFi2fC5T7z31ECmT3IMMbhX9L7cQp5Jn1gZMcUPS9RBjipHDBmr/j31ScniI59LPaYZkxVgWADHBvPor/8GtmCRAI3hy3IKhyTk2xOqNyvEuwu0ea2Cvytb52C/gHs9xdsEdB5U+r9SVRdtNYgH0tfGfv+7kiZFr3PVg707DLm2TcweSfBQERecDEYSwkCmCarlzihAn6TgTrOb5CNwDllUUnn8D7AfzfEE8YancbJsZW98Ehx0jituEPAjCXhjSPp7XK8biYzTNfCVzl/MartTGe98xobJjpn0msm+l69YylEBavt4z7McPezmdF64eYsu9A8rdN55vcZwr2n5mL26ttkb8IkD752cBTLr2paEeLR95ajiEBDdHwUAqCVRfQvN7fXnSZClT+ivxdL2g0I1JFy8crAFyecG3fBM5PSUINpvzn5MGS2CHu7EP21RJ+oiFqAOzgUF08/6T2t0xJleKYcJri14zSOBLahaMSzocKvspDlFYpsvKfwruXrFvd4S13gEGUoDtO37Go2JAJBI1tMdnwce3mK/lJEtuHsuOYItoJJpfH4J8LFQ4QldpZiBuAz7MzDP9TtVHKRtiJZzdJ32Q7fxseJ9QvCvjRh9x3yEMlHY5MejdKSo+Gso68Dv2P9KdpplOjAI4yj7Q45zWDgmG66nIsKYml1OFzD; 31:DGHg3UqNO8AgG+InRyxfcXK9xvaBvTizaID+1F4oH/vcJxTCq1w1b8Z6MIAeet5I/9Pkq1XTvVmJTL8IUugz4Ogu1CKyMMseCiEUkHB8YB18ovwdfCoFjox/6wEdecxfRclDbVPq5H8KyLV2gsQvPt2xgrfUNJsx6/bKcsNJCuwt7NN1YacjEsMdhhCPX3aqhpgMTI5RXPlcTswP05qlG+c1eiTjDs/QYtlLmVKblk0= X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1441; 20:gItc8WgAPCYz/0SanfuBosKt9WYGq3H731I9Y4QvGrvvC8+aS9BPZ3swtiUM2XnKOdTO0p6olln1k1jfQLpc6rhRAyV3M7H3s8BLlqVL27svs34uFbI7Vb74T9VH4kvxcXnO0ab5f3gmS46FEIRt/m5mn57QG1bSW7r/VG8WsXiWLYVQcMhzeetOet1izyCT3D3SJZRKWG9CgGu2aDi8kEHBOD4AzP+ZhE6u7AqSiDiPMKKYCow9dPkWp+cSU9PgEli359p/8+c2pMlJ4V2B81wed224Hj4asSJxg6DOscfOFxyo+5+RyTIf4US6S/MIfaI4+EJ91jWrnvPkhlJvaAQMhDpdMkMyOhxtS1s2Q6ZL0Bv3DI6qBLPcmVBIUHI35ROHaRhfiFgvQMojQ49gys/6LAW8VVL6ASXP8X82qSDNgZai5QGciP3qwQ7bfi/BhQyCHfN6aXyOcNrZRLcYh3JSxlwCEoNPxrPVaeFZUJyzekbwmjGgjV3JnizXH0lB; 4:X/isXcZ0hs7mj7u6PayuCrxa+5vPTXaUPCrNglmmfS0yBV41HIsnaPfQiZAO2A8Nx7A0rMDFSKlv/q6KIuzI8qYoXdNxaL/RLyF3txriTEqILnqddLOgY0lTORC5KoZpVM3sk07FViJYt2JdYvl3laAt0lBY+I0U2ycEOhi7UPhYAD/6EbSKlVr0KBHRguzlN4gjJAoH3Zlf50Fugy7qROeH7yAob/oJr6NsdePou+WpZYVFEFcFRZx+b+zwiUnEHZ1HyNX40LvoCEnAFNb5gYdFJD6WJUCFKZiP6avE3wfR+E0XoD6uz6rvXweydWWfLzVEdqrP3Q2ozht+XCzT0JCxYpEnr/P0KjdTaMUzYJDeC1pNtNuCgY7ntA/Xh9AJHFUDKH+Wys31IuGA/SfUpg== 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:HK2PR0601MB1441; BCL:0; PCL:0; RULEID:; SRVR:HK2PR0601MB1441; X-Forefront-PRVS: 00286C0CA6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(189002)(199003)(189998001)(54356999)(50986999)(105586002)(76176999)(50466002)(42186005)(7846002)(305945005)(4001350100001)(229853001)(97736004)(53416004)(110136002)(8676002)(83506001)(2950100001)(106356001)(77096005)(7736002)(66066001)(81166006)(19580405001)(81156014)(19580395003)(47776003)(69596002)(92566002)(586003)(86362001)(68736007)(2906002)(46406003)(33646002)(4326007)(101416001)(3846002)(36756003)(23726003)(6116002)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:HK2PR0601MB1441; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; HK2PR0601MB1441; 23:9k9h5axzdYs2TG0kjZF1DYMU/GXU4lFeeVNYKK5?= =?us-ascii?Q?KSF44NKTKTs7SFyrF5tdyhiOry1Dd8984ME+KiWX8oVaFUqUcl6r9hxkmNkv?= =?us-ascii?Q?ZWaQEzjWtApYYFUxxDZuiYJ0bi466C2uq3cz9tAbPiBxRQusDvWUVoJaNGaa?= =?us-ascii?Q?JK4CL3688k7HOMp+raxvLKIkMBJNGMYnAIw3F02dCkOZo9TQx+kd9sXDD/Re?= =?us-ascii?Q?Ob0kowZuJ7moduTcEx5cXc2l7yASJ+rDHMWAxL+KkcUYcsR/+nMWh/LcSnIW?= =?us-ascii?Q?ClvOYcBKmPQgUMcXK/lK55WyDiOXamIYsSDzF6JAPr3oPXQzQr46qMJduhVr?= =?us-ascii?Q?p0KpkjLtb7bqee8Zp16SXr+zNmakbTvtN1dGCB+WPf1MegzyMVCXaUAlNmfe?= =?us-ascii?Q?veuTdm2EL+av81SRXlKOk26HP/LyWbaXGyCrbIlObyQKeBqsvdZRGWgxQttJ?= =?us-ascii?Q?tULbGXzqWMCm8rWdZoejf+dxkedCeryzVW0M7/H8JJ7y7R0AyC1WmAQQLUDm?= =?us-ascii?Q?SpJedU73JsA34mGmIr8IXuK3mvQrzW3JuTMDX1N1hhcv5VV6p0NKMFQ2Oqk8?= =?us-ascii?Q?Pq+de+F2/N3qGF+MYI1ZFeyoe4hL8/6sBVa1j3bStYA2ZGf8r7CdSTwRs5iF?= =?us-ascii?Q?ByIrxk/i6NWms4YZG+faYh+FTrAX5h1zmGYkRib2fpi/1tcT2kIshMMK8qYr?= =?us-ascii?Q?kYpWIMLUNsXyHmhD+HhhMejG6HZS/d6NPIYSEZkglm59ym93RKl5YoucFqPh?= =?us-ascii?Q?EV2/UHHPhT0iXmzUm02I2aISsxC40gaup1pY2H/V8CnO4+b05S8V4IY0mFui?= =?us-ascii?Q?HYVMF2VIjVg2XXtYi4su31mfC+a8zsv6LXOIe7ipNo3Xlyt/FKy4A6hKOtMH?= =?us-ascii?Q?oBuJYLW7yZEcuFTM7F5KT5E1EoFsGFSSufmLizdrBh0tVkGBec2UgcVDdco6?= =?us-ascii?Q?QBy0EuDAAgVbmVJE9GRIZRnRRfbZaSj1yBmNrHW97WrVH2FO7kG/P8rD+fqi?= =?us-ascii?Q?nDSjDkH8dFaxaxi43JO6e+HSojfHKCoOjHSDWhWd1h9ghCNPuEYa4jRQA8L2?= =?us-ascii?Q?NrtlBMLkZjvJDZnEHR7Iw+2idITYE+mDKWOX1KLxex+7ha74bWHXItd20uuS?= =?us-ascii?Q?CfVAmXThbKNhGpuVP9k3nLR4KScU79xV8WRyiRM0jOYeipEjGrTEnhw=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1441; 6:4ZolVUBgXVnALaekPDnQq3nDaz7Kbwgnwd5x4Gm/5ysGiTd1DXUA9kMqbqmDgKlwBeDWlaNytvqFMYp/gEDe00lKIW0/nraSru5qlKXAknUOTR7LCpcsn6nWt264CxwQwNjs2Hzc28BSjduYZ4i137tAN0Z29/Cit1qPoT7IoFD8err3UZI6ZsYOcv7djZkmduTxUfdD4ZJ43E3n/ytdRJ9wjyNxmdWcORA/5r2km1gTcniMkSSGb7dTBegp1yWoTM4ykMeuqWg3QDoNPvkDnKYkFSKrQX3Z/0IOc/ehvifsxRupeyW+lieFpiDI9usbgJPBh53MKOS6BhS+mkt2fg==; 5:YCWtrN7gXerMr0Fhw2jatM5Ku+z8cH7pWNoxgSIwp2EpMtdVO3gL3ocj/FHkRWDLjp6E7A0jYNQm+CcFyv5+af1+e+zr4Zl+RPb9TKv7AY3ZN1UTgnN4zifIl9hNHM9MS0hRXxu1TpkBEK1FcCc1rQ==; 24:8sidSAm4DJrNQ7UdtVaQhPQ6+RRhnITEFd8vvrqoHIQ3NHPFRtSVCSpYvJ6dCtEB7LgT13cnNWRrMzp0RRDWKEHasXLAv60JEew/l6OOZhY=; 7:GfSEkUVoEVRaK9iVviJ87RpIDUzqXov+Kh8lBQphznBu7HbpCK3MnG/PQPB8+IJ0OsdR+DiJVRQPWwe/B2rfXnBWkBudU0uHmour4wqyYJ8jjG8UEu7VqTrow9v+j+ldwizwXkZKqBIUqbRXcK1p5Yak7oE3VdY3hYLB3V34TbZtBOlqXtqHBazrVyEtPqqIGUmlSuZtSZ/PPo+us+RJeda9CO7YVefPMvuiS5D7OCFOTUAGdmxTvdBDCSV3mAYp SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1441; 20:V/CceT9JXmFHMOln71WZQYUcwSOWRjbmozIutqQGPuvxNZmQ7exKb2heGHrJJtMIGocImT8ngX1CxBh7ZEARKUxuATTrd1ahSte1GILc6sH+xdyIHGeDl5KvnxrwEeUbLlrgMALn4hfKJMGWvE0OIyaeOK3/9nw5UrVKaOQFhw4= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2016 09:27:32.2343 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: HK2PR0601MB1441 Cc: linux-renesas-soc@vger.kernel.org, Linux-ALSA , Simon , Liam Girdwood Subject: [alsa-devel] [PATCH 129/159] ASoC: codec duplicated callback function goes to component on uda1380 X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.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/uda1380.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/uda1380.c b/sound/soc/codecs/uda1380.c index 35f0469..533e3bb 100644 --- a/sound/soc/codecs/uda1380.c +++ b/sound/soc/codecs/uda1380.c @@ -765,12 +765,14 @@ static struct snd_soc_codec_driver soc_codec_dev_uda1380 = { .reg_cache_default = uda1380_reg, .reg_cache_step = 1, - .controls = uda1380_snd_controls, - .num_controls = ARRAY_SIZE(uda1380_snd_controls), - .dapm_widgets = uda1380_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(uda1380_dapm_widgets), - .dapm_routes = uda1380_dapm_routes, - .num_dapm_routes = ARRAY_SIZE(uda1380_dapm_routes), + .component_driver = { + .controls = uda1380_snd_controls, + .num_controls = ARRAY_SIZE(uda1380_snd_controls), + .dapm_widgets = uda1380_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(uda1380_dapm_widgets), + .dapm_routes = uda1380_dapm_routes, + .num_dapm_routes = ARRAY_SIZE(uda1380_dapm_routes), + }, }; #if IS_ENABLED(CONFIG_I2C)