From patchwork Mon Aug 8 09:20:46 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9267325 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 41CA4607D6 for ; Mon, 8 Aug 2016 09:21:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3179826220 for ; Mon, 8 Aug 2016 09:21:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2649227DCE; Mon, 8 Aug 2016 09:21:08 +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 8380D26220 for ; Mon, 8 Aug 2016 09:21:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752595AbcHHJUx (ORCPT ); Mon, 8 Aug 2016 05:20:53 -0400 Received: from relmlor1.renesas.com ([210.160.252.171]:25199 "EHLO relmlie4.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752521AbcHHJUv (ORCPT ); Mon, 8 Aug 2016 05:20:51 -0400 Received: from unknown (HELO relmlir3.idc.renesas.com) ([10.200.68.153]) by relmlie4.idc.renesas.com with ESMTP; 08 Aug 2016 18:20:50 +0900 Received: from relmlac1.idc.renesas.com (relmlac1.idc.renesas.com [10.200.69.21]) by relmlir3.idc.renesas.com (Postfix) with ESMTP id 2C6BF52338; Mon, 8 Aug 2016 18:20:50 +0900 (JST) Received: by relmlac1.idc.renesas.com (Postfix, from userid 0) id 26E8C8002E; Mon, 8 Aug 2016 18:20:50 +0900 (JST) Received: from relmlac1.idc.renesas.com (localhost [127.0.0.1]) by relmlac1.idc.renesas.com (Postfix) with ESMTP id 1E4B28002D; Mon, 8 Aug 2016 18:20:50 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac1.idc.renesas.com with ESMTP id UAN12324; Mon, 8 Aug 2016 18:20:50 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'208";a="217447480" Received: from mail-sg2apc01lp0241.outbound.protection.outlook.com (HELO APC01-SG2-obe.outbound.protection.outlook.com) ([65.55.88.241]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA; 08 Aug 2016 18:20:49 +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=6f0cIbP97/Q12GCKF3EKn3ohl2Zya/P+YzIe651LbMg=; b=Aa4vK2lEE3yUYrbz00aEirhrlV4YbIGtyiPnfalIdxZByJ2i45EqdQDOtvOSE8j7T37MP6A6C6cZI4gq3/2jm5qv6drTuJD2bhrDGBSRUaWce6FppfFBks3sFPYW/SxdTzEPF3VMNKnZXFfIPslmGsPqvxdvXq5wFENGMZuPKkw= 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:20:46 +0000 Message-ID: <87mvkn39pl.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 107/159] ASoC: codec duplicated callback function goes to component on nau8825 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:20:46 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: TY1PR0201CA0027.apcprd02.prod.outlook.com (10.164.90.165) To SG2PR0601MB1453.apcprd06.prod.outlook.com (10.169.106.19) X-MS-Office365-Filtering-Correlation-Id: 851f42ce-af31-4559-8c15-08d3bf6d4854 X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1453; 2:H7EzAo8G4cdC8WnqzHdirrYcFZnNe3QFGIo1nD6STJJk7GSdwJ251qtjzNuSe49nb/frjitxtaz6UNtJOtKG3zOTfoSxjTXlO1Of1Z8SP7hoqN7NW8AtTywiybZMD2UiHu6lHZs2Dkng5Yi7qimx/b76YyCmapjC1jaZpFEjiSxdvo+GpuxSNrrvxXjiuTov; 3:uwcbmjN703rfff9tke9SLSj4USHcTRDnzOoBbRlJGBaJ/iKg/U2JUUS3PMDjfyLxCQov5tCkRkMjvnZotutasLz/8EBMQicC0i5mzIi/rk2bjb12hqHFvYt5GNmRUi9U; 25:s2oU8MiJTWnO9wKg+K4MaKJy8KumZjIck4smoTj9lbIiWmnmg9ONq5qduhF9xgsghFAXSiW0DGiz3PUfC6KMDIw0ukPiIhtx8mXES0/IDJh6WrIuq7fAaM5MTl1i2fhJQb+oDE2mqJqx+wfqWyAcgmVpMqjx/clWNGdTYUu53Gi/BJ2/Lc7Dsyos1hj9+oOU3ZsECAs7PGuMSUIAdYQLTwv21tTENkSbYi156LXwqXIarfmy5SYbQu+eBuMFFae2ZFg3vz0v55zkKhG+MDRJZLy+VqO0NIGPzseYrsEFoG5kQzt8HhD6t7pxC0pa8bvJPu+wmBoi9F9cTaV6/A6qeb+/1n1nu1k8r5dqAgtdJ4Dv462kKLuW9Sx93b5WOF+PfW2u89uHWWvxjig54gRkgVIFON3hoWqxJFYRBQgKsZY= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SG2PR0601MB1453; X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1453; 31:RGrVo6ZOae/c4VYPeqFaxnIxIKYGMC81vd7D0yP2YI13qMzKRNhhYwVrqVTgG+kOfvvwUYYlUUPkGlhQJYuB5l3GyQ6IE4cQHv8++g738T0uSQ5PcqoOquBO1djP+9dEcHs468gRlgJbSJQh/MSzO5plS7OOi7v3N1bC2ASSy+VnYf0RRzGcg4IHKpklvsyyurJUrKzFoAjmGLimr0GqYUVVrcK6aWWemuYrvCgHWlg=; 20:cYDtq7BOeVTmsT4ue3y8PpGwvqkGFO+TJ/hezDJFK5xLzfcHIhkQitEy6l6HtGWVmCtnBUe3mJzvToA83ujs4MJu8fXuyY3O7RYybCZXmK2vn0TOKyTkVm33wOLuXw93vGbrv1nt36voxy0Q0T4PuQ0X5Vw6n6ecVTUG2bV1HDVmnMqBGwJQI45KLu4dDuXGPhcqVC6xum5ihcpH9MdgoS8KGXjp+Uk2GfxRZRvFSNhfl2sWUh06QJPzcdjYsSrk6mB03KGtQIbbHS8YWnzUsh5rqVz5VwXV2NlkehgUoO3sUXFt6ExzcF+dmaBS+2SPaaNFG+Socs4JlzxiNdZrfdSm3Ukngls2fATr7Gi0A6YzK9O1YDCX2dtRZalrvnh1US0IamX696I7+64WBj2znv1eeUmAatluA/7svCCANhLUoEFj/ZhrEPsqZC6WI7KctCFQPb/foWaHYh120iPAmg0zY/d8dAX2gwxiTEEP6Gs2BBofR3OkyuVl7A1Fc3xG 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-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1453; 4:LD8TYlNySAIRbszUVxYo0qCUPJATtCAVjqMpvjxYNQMeqGLLVZsGwMYfYME3Jw8pr7f/Pc6LLWEyd7ik50SIeSkCNjVHGYK4K+QdBVXXozXYm0evqGqy4QR5nUDbTN2L63vNGS7QhMFM1jJHdf6okn6/4q0Lug/xw4G9Q52T2hUIMvKygQWBeY5bnaYIu0Ljy6aDIZVFJzUHjA9iH840rXUAnB+nNBiN795eQPg+8r6T1PGH78nkwmJcl0QQEH/PHxyoDos+wC5YJFyWaPXIRVOZmfIeOwj+0YtZO3YFDk2TZ82tmsGlC04n/nvBuLaYO2AMlB4/+oWzJIXDhUSPzXoVU1Z7J2mC2ENrXzfAQR38K4oPV/TcyyNZVaIEr29goqRSapzXRg3kMGw38PfCvA== 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:tsOHT0lRaaWaBZj9gJr5BhxgEx1iB4ywXUmBCl3?= =?us-ascii?Q?aWg0TIzjFGT07d0gpniykeYTgI5qIx1Eev71qKlMIXJm8AnpsYjAtuyUnWLg?= =?us-ascii?Q?AZRsWbuZ1WQSqae+oSIOAuG2J8U1fRUchJxIS/u/V4q3cYli5mpJnaRcrLKU?= =?us-ascii?Q?TvwkYUaPGtvDvG7qda6UCejxb6xO3v6LCNCDa906GI/KdMeqox4XVLL5MZ/9?= =?us-ascii?Q?YXHmP4d/kj+we/3H2VIcR8Jgv29SsU9qw0Af8sDsAntdh8qjOu2vwd6jkajp?= =?us-ascii?Q?LTDuNIwCFthkUMI+yIbRxoMfminbiQr6Zu1OHi4N3mTevY8cKnEbXguw0kYf?= =?us-ascii?Q?SzUQVR6xtFjOplus+ryTdQPn+nJ0ZhZLHOiMYvcM07kVRodC9/DQtcDNfmWd?= =?us-ascii?Q?gO+EOsEjThptP1aXo7cSfufwkPuI0Fu0oTJvFJEtXxvoEum5G8KUwptbkZ/G?= =?us-ascii?Q?C2ryUx2d2Z9bETiIJ6JoxTYXhlBLAQkxZeNlqshTPAPL88xI4zX9gj687jAD?= =?us-ascii?Q?YKpnkI83ueUNcmCTCPTAwuX2ohJ3CrPuilIUq+bSBi+/tjfSUjaMyDtT6XeX?= =?us-ascii?Q?03NPAfVjrGPcJ1abIqFC2wVwVsnEzkp9wc6dOK6CUZQj6v+aYkAwrMFBdHlj?= =?us-ascii?Q?DZ9eRffAzR4Tf6Mi330qRGHYzf7p+14jmSVzLGD5VpZKTYRy+wY6zqjWHxv5?= =?us-ascii?Q?3MiLqa65C1iXcRWDU17zk/hkM15H7c8CIW1xevpBvMJagK3tXJFF3dd8fX9C?= =?us-ascii?Q?x7P7dtsOAVr4enVaohJu2KH0vGdZxlgo7z7kj+er3sC9UIlEeIncqiTVDSVo?= =?us-ascii?Q?CB16Tjs+ZHEMg/CozOxUCK+j8CHSfQp7mooL/eVRgCEa7in8XJVBGWpOtzcw?= =?us-ascii?Q?9ckcO2UV12suv+JeRwT2yNZk/bvAlZnPgE2pqkeNmr8/hEGdtaibLqHo284F?= =?us-ascii?Q?nY9wwEa29AoP3ldngdEQ75ED/awX6Gs6Pl/MDNi6ENY/KnEt9YfVtqh7c3Br?= =?us-ascii?Q?OaqxGcW0/m5nli5XVTdjoe7ERqzt7H3DNBs9JVBX5DYSkY1lPFOkFsejUw/q?= =?us-ascii?Q?VG2K7Awtst2uT3Rl3fU0OCbqr2yuI0LlWSQhpEtqq36x0zgXUjkQES/0zCLZ?= =?us-ascii?Q?qRXBOEN4vyib9fmLiyIlwGzcJiXdX7kjCPFMtJWJjjyNPcpXUXOgVmw=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1453; 6:V1gZs+Ih1Mx4kpcQ7xTI9iDtxZe3htxMBEhmW/khOonbxNXis/EKSORPzUym+D8Npt0WHSYh+aMAR4xx94oOLXq1J1lZLKkf/6O3cqybZG5DBfJDeOqvJ1F4wnnwP91jA3itjfxfcqrlcNiqJNoFaDTOBw2C/+e+qAiggNuZ5UV1rShkp5yF1ste2lYekEJgKtRy4ZW6kCpeYSEODKQ4U7yBDs73/jCMsq1h3U2XJhX7XeLJ2qfdZUt3OGdNe266yyHJH2n8EFxKTrm0H55K/iWl4SIbP4ZnqUxz1ScjHeXlmhkmXo2WHHDfnk15UkbTKcDf9Mwo8Y+F0cYJd5x0Fg==; 5:wfUXjUXoYz4SKKXOWnaXtzQig/woxVZ3B9JDn2UbAVNsGGOEYu1o1jOZi2PMEhCYaKL4TwBM/t1AQ/YtbLlAkPt/pgy7jDw4+y7N11sW8xTLa/Pm0bPdxOalXMSzXwhVpx01n7fH2iv4kXsuXFEUEg==; 24:m1frcSnqNjhbu15creLMZ3FdR73F2hMMzgAP70jHnQ0dg5CNFIMgRDKE6mPjLxaQNC7wMHSpE5+0ZaqnEu6DMakkVnp9mtQMMGAfhAR9Vk0=; 7:EO1ZnV6Ct8hW0KsvpKvTrPeHR51URbe8UMLnWcTRlvIes3JRKaU/Q1jrJFs6I8TOlKOjthraYO4GxxFqUb8lNJhKhIIWLinyuaHg27xPHtp1kAVNDJV+y6EDVKOICpIbRypEU3Su4AMWOXGuh+9KTc/POn7EHPSJFQwC3tkDpLP/gb4Mr5sv+VPFkS0zo/pX7Y0on9s8TDsYutcvK85NSfjYtvCeGFhUxuZHVQDNj2Z1y+gSa/dyCleTmHdWeAkW SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1453; 20:ZOTTRgKbtQJ2neOTgsQQseAtvH1mpyZ5H0HevsHTmqj5eX+JiNPAZo/8yWTskFWYE9sH7rOKhYFcjLGxMYQIr+5cLkdEpeSlcEnM2BpYXaUJPXW/9ePRAslqIpCf+9wgX2UGiyph46N530qamYNfSkF1fNC4ha+HMaTrXERrb+c= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2016 09:20:46.9618 (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/nau8825.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/nau8825.c b/sound/soc/codecs/nau8825.c index 2e59a85..057785b 100644 --- a/sound/soc/codecs/nau8825.c +++ b/sound/soc/codecs/nau8825.c @@ -2256,12 +2256,14 @@ static struct snd_soc_codec_driver nau8825_codec_driver = { .suspend = nau8825_suspend, .resume = nau8825_resume, - .controls = nau8825_controls, - .num_controls = ARRAY_SIZE(nau8825_controls), - .dapm_widgets = nau8825_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(nau8825_dapm_widgets), - .dapm_routes = nau8825_dapm_routes, - .num_dapm_routes = ARRAY_SIZE(nau8825_dapm_routes), + .component_driver = { + .controls = nau8825_controls, + .num_controls = ARRAY_SIZE(nau8825_controls), + .dapm_widgets = nau8825_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(nau8825_dapm_widgets), + .dapm_routes = nau8825_dapm_routes, + .num_dapm_routes = ARRAY_SIZE(nau8825_dapm_routes), + }, }; static void nau8825_reset_chip(struct regmap *regmap)