From patchwork Mon Aug 8 09:15:27 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9267255 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 9CCF160754 for ; Mon, 8 Aug 2016 09:15:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8C7DA212D9 for ; Mon, 8 Aug 2016 09:15:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8131127D64; Mon, 8 Aug 2016 09:15:34 +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 E6E7F212D9 for ; Mon, 8 Aug 2016 09:15:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751985AbcHHJPd (ORCPT ); Mon, 8 Aug 2016 05:15:33 -0400 Received: from relmlor3.renesas.com ([210.160.252.173]:25005 "EHLO relmlie2.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751951AbcHHJPc (ORCPT ); Mon, 8 Aug 2016 05:15:32 -0400 Received: from unknown (HELO relmlir4.idc.renesas.com) ([10.200.68.154]) by relmlie2.idc.renesas.com with ESMTP; 08 Aug 2016 18:15:31 +0900 Received: from relmlac2.idc.renesas.com (relmlac2.idc.renesas.com [10.200.69.22]) by relmlir4.idc.renesas.com (Postfix) with ESMTP id 31BD3593A8; Mon, 8 Aug 2016 18:15:31 +0900 (JST) Received: by relmlac2.idc.renesas.com (Postfix, from userid 0) id 2A0A42806D; Mon, 8 Aug 2016 18:15:31 +0900 (JST) Received: from relmlac2.idc.renesas.com (localhost [127.0.0.1]) by relmlac2.idc.renesas.com (Postfix) with ESMTP id 1DCA62806F; Mon, 8 Aug 2016 18:15:31 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac2.idc.renesas.com with ESMTP id UAG13715; Mon, 8 Aug 2016 18:15:31 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'";a="217447034" Received: from mail-hk2apc01lp0216.outbound.protection.outlook.com (HELO APC01-HK2-obe.outbound.protection.outlook.com) ([65.55.88.216]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA; 08 Aug 2016 18:15:30 +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=8lJDcXh27gRoehMTfR6wzD8/dR9y7mYU23tExJy5gN0=; b=QnpZ0KzPe2WzB2hQ0Rjnz6QJntR6VCCmIoBQNG2hBs1UUJWHIfm0qbCwH0OdQkYwgW65tfew6VvTfAwfh+6WNa3zgOWTvf4YDhz7DZotoSgVdMwuuVfuflhXWCToWVnm/w7wvsmO7oSgt2oBQZfgh8QMi4lmghAIvGmqRzQpgvs= 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 PS1PR0601MB1452.apcprd06.prod.outlook.com (10.165.210.156) 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:15:27 +0000 Message-ID: <87bn134oiv.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 090/159] ASoC: codec duplicated callback function goes to component on da7219 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:15:27 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: OS2PR01CA0040.jpnprd01.prod.outlook.com (10.164.161.150) To PS1PR0601MB1452.apcprd06.prod.outlook.com (10.165.210.156) X-MS-Office365-Filtering-Correlation-Id: d19469a1-cdbd-44c5-d2a9-08d3bf6c89e8 X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1452; 2:NkGb6CciV0gszsBQ+VX7hXzLLDmLtTXbIuHaz+jvN9P+K6JRPikvUXBi7fzy64WwjsD4pc21c/NTT2pCeZfXTtO78yU0xeaaGM0usy5dSeND5dkxkgWTL9mRY21Z90Q6hrUK4nI7M11mwVyShf5UXrY1XQvy98pGSTZLoSbDTFsEUsrMnNw7MI2izq2acVmo; 3:WEHJW8nybLZ0cSkbx3Y4ShQqlIP2/AMdlRnFn2Kub42U7w0fHNromgQkCMbEjvG5k29UpbKVJTHjYUXvs+w0FifugE9VrU3F1GCA5ZcZkAo1DK/1LHUUBGnh7YuvQIRs X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:PS1PR0601MB1452; X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1452; 25:u0PiECUPJqnf0TK7ZqVfqNMUIUljKbB7QE0ssMZEr2Cg+wWQQ+TbC0u+yHdZfPiH8zEhM0zkvEaaW/fI0oOnOAWevpVyq+roQDmXapzNkmoPu+cZLb89tzNY9O3GQck1imWKO9fNBiAABb1ZJFoe+D6GBhWtB5DReywiN4Eiejj5x5FgGnFQ5t+X7PJEHg5Usx57kjAhrkaoHqFFungpCz1LqP3xVKf/9vQaYcHVjWkbZee0g0zUKXIP/17UDKgpRM81A0KJ/EM/0ej6BWKpO6r1YHAdg0z/f4N6H90GXG0mRZ6gToet697GBo0SuLgX19mtHzsEDAIC0iRAOXUyVT5ZDPhEC+iHwtU9S7yl7PlgvwfzBvaIGhuk21vZ/maSxdqyD2TMbdD8mrHh3xhKCBU/u0GReSVw7/kIAnENitDSXdqBBpslAemxw49XzSBImZX71h0N62IvGA+cZDoeF69bstu0XQmAUS4xAhqlV/Md0/IUtXcOSK3KGtGXV+DyKCS9GzLX2nZvtSsBhGuYITkgThuIHK1ww5es4wPoQRMPq/m3W5NryEeoeAhNbPnN6ZBjCtogEIJVafTMk96tYUUl1qB1MIMN4ifW9gKV94FSbdgUrG5FkwORQUsgdZNmEh5fLZwSB1CNKR1QOyuPlWp/8C56hTpwZlKDjo4n+Nsar5PqHRZThxdh/mfYmzd5; 31:06tmOZMq98/FRKssSsOAwQRCscQe20HZousCE6AEFqBSQi/AlzFjGw6bIze5Fu4GlPXYB6+mj5xGYcxXsof7mskTX0McJautSJJ6TDKC8ubDdLNdWIp/VHrCBvUQHvXn6QHFBL7IDUb+Kpd3cMnYs8mfMk6Yxd/gBYTC4/LndUHHvtqs4fklopIjEbT5+RA/v+Gx3OpAare1r4FGRIx+gsIJaRLVa0kQTqY mnnEq8ig= X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1452; 20:69ny9N7ef2I8pOCAcU2rATmDbS0njGWVRi0PnUo40ecHUlEzoTm0AkpxrTo3e1bPZuL7XJyE4W2S6aoasW/ZqFp2jrTkcunXA+pVj2Q7VaTWSuTHPUOTIjs0MTlFICgs0holA1OOM22gs7EwayWJbczcWXEeg5QlTEuYctkG/cbBtP8snDJ7Xvazx85CPKeZ3spf5vQPfq8AQP7Yp/NyC9g/io1qKuZo/WQ5+s1ws6dFUfV7S/ehVhB7UvM3XUoGYab8+x7BwhFzR/ssbgleos54m9fV9gw52Xiogo1wkkZjrBrHUKo+g48mzRD/8bG0/5r84WemHVzGApbcY/xAFKqh/aX3+KNgRFGmWHiEx5z8Zm58h62aCpsqbxtDsUto3WMFiBH5X6JtK8zrrXFKUS4prjopU2DvL/cQSrU4hZrvwkVjr5+kr3rD7OjLjHlMsaSCdCuML/ZF0Nll0rEfHUFA5L1kBZ1hw8xPMJv7dfTqViib8psn+EzjaSmI3zfy; 4:/QCr6H57Gc+SRsQSoJjfbrgv5iQiii9ShR77NkS0nn2ArKyCq3mmtaF0OOgx9CvkVg7QDVGFTWS/xKBooaYsFmxaj/nsBvl/A1lR9azM+/SLaHqPD0CcYbLze41LWEe2ZNvfzsLNe+FV3LGhsUv/fc0HjNJCcS5g/6o+d8laBeelK5p1fA9goEYszoMC7T3xdS6iz4WYkBUqAn/a/BI10capSdbTPvZdvtVoGfd/XbVKLUtnvq2CvuRibArHHh/nt2shPlG1VppuGURrr0aB9W0eL1o86bWwltZbrjfHYgX9EhSaThMQGLu4AiXMXhn0f042NO8iiEpC1MjsI+M93pc5rsLeTO8Q5XHydbeOu5opjauEXCStj0Kw3AC6jPVWxkF+jbquamh4AffQBGPcyA== 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:PS1PR0601MB1452; BCL:0; PCL:0; RULEID:; SRVR:PS1PR0601MB1452; X-Forefront-PRVS: 00286C0CA6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(189002)(199003)(6116002)(86362001)(76176999)(3846002)(54356999)(23726003)(50986999)(586003)(7846002)(7736002)(50466002)(46406003)(4326007)(2906002)(101416001)(305945005)(92566002)(2950100001)(81166006)(8676002)(81156014)(68736007)(4001350100001)(42186005)(33646002)(36756003)(105586002)(66066001)(47776003)(53416004)(77096005)(83506001)(19580405001)(19580395003)(97736004)(69596002)(189998001)(106356001)(229853001)(110136002)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:PS1PR0601MB1452; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; PS1PR0601MB1452; 23:aaCfMpJtn9Vqqql2TUlvq3HmyQg2hdxSknIq7s5?= =?us-ascii?Q?603bWqQ2FeDgproL8zOlQ7ofDUgdibXzh2IJPEqPLY1dFiUgSqFX1zYr0Ge1?= =?us-ascii?Q?+DysXj2AQ2Z3DwhMJ2e0zpxv7pUFM25w1tDmzODMr/h9jhdXVY5yzV+PhCl6?= =?us-ascii?Q?1nNAUm/Zgy271J51EWS7psl/kbeHVwKhliowDNkX7qDpQa8C4s04XHYJHLwM?= =?us-ascii?Q?E2Hc1mEtk5T6/YZu36nuRcOYcP1rKl0iosgNy799ZQ0LK9xfhRO6EUc47fXB?= =?us-ascii?Q?UGLCbFpHkBhzW3spdy9FJBWDPNye8K2ZAdVoKBhg1NPGFG5mAV5nxeCGu65N?= =?us-ascii?Q?KHzw29u6fX3+wMDKELgDorpC6JGCttRRnmsl+rEkTYgWNN7ct2R0+B9Fg9xc?= =?us-ascii?Q?5zVl3uUJAsuhW3Y7pJ/bKXrW2Bv9hBYKFZ5g4RDq3dhmLdQGJQuvv1burdp4?= =?us-ascii?Q?Y03URmo9XANQd6FCfZtc/M1zhfXakPdlrZi6qH9xw1JfX2QV96vHObqC2wYJ?= =?us-ascii?Q?U29YcsuVqNzPsRLL2faGGmLKxNzqdQYa06Lx9JnJ8hd1heADK2Hhz2ckGQiQ?= =?us-ascii?Q?pCRxdtEJL24ic+NqA+RlPV8OPBo8AGXl6xhaSPCLgKWIb0fVYlya2acpYkdn?= =?us-ascii?Q?8iDQyF3lugXn0Nq8dBxpVSd/UKcCubrhmMPmsGAi38E6avzHZNBp0vY28BRV?= =?us-ascii?Q?i5H6KC1fBTEyzB6v65t+VaubcnUWREKINPkBTs4H6JMlUENo9cKAq8QZ6uA4?= =?us-ascii?Q?XjmOw4+yXANwa56jGafHyEXM3lKdpHXN+TLP9NCfSzVrC3RKuq9/V41yT6zf?= =?us-ascii?Q?X2PKn2Z+1Q6FEcO5VP6jDP4E3bU/v5pDI2xOFMvrV+X7hh516gWKxQxE9heF?= =?us-ascii?Q?ymuC0LhDVGVZdubHSSMNj24SK4jQ8gVDYWB9/TKNKMKwTbqr2ibbCZny10sd?= =?us-ascii?Q?1WBn0LKyp28lYR3pTxrQrWOZtxoI0l6NndtElZwn/DnotMsx8ZpmRKkDh9yb?= =?us-ascii?Q?jKH+kt+gtA2TbJ63wjkENikACPO1E459B0L2tdyuhTz4nR+Qxp2BBTx8TRgl?= =?us-ascii?Q?xlrj7WmgebzKN7ukUCvFNrntAFFuc5p4g6+ko35RwZ3isPzT4m071bzodt7p?= =?us-ascii?Q?VmnpZuhghXXva/yQoitPOlLHK1s2c2D5N6yC6R0ls5YEZ0+0sNkZDvA=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1452; 6:hFpR5W4lrlTzrrA/TXeBXJOidx6HQXcLF8qtxGhR0aHvQN5POEU5W1lmRfX5xtsvlS8zaIfhrgitWu55ymwzdLn9lSQ1jk2dbELL7RMaUjQ81DvpIwb7Fsgy6u7Ad4/HUVGtDR34N/5UQp3ff/02zOtyQpKiwmPjM9XhPfU81MSdBudvmlEiw+AKTFoiofQw329BuXlZHFgHaARAkKN1mtmJ+XAeqjq1uOFpygAwdS6flnvtJtw56HgulVhhB2eLExW+m2YaQaLrJU7aCyw53BFsFob9w5rDFsaAgLA5piN7AR+LnVG3WsJkNo8CSJ+4kb+t59HpgpuZx7dMba7oWA==; 5:NuTypvspWdpAxpCRJlxzw5xIQgbrtSy/70YRWXsUbD0y9BY1/0U2sfez+mFrusNfb7DAKZqqsl/Np73KLjONt7yUVH8FdmiBYtma8WW1DBp7WG+thYpGe9JyS+1+4/J2EvgECGoRavlFVRr4QcrElA==; 24:xur+NSyNA0sjxlTqaObvBPhV2MIEe/BJyoD9tUU1exuKe2N9EyM5xAYr+dCWVjMaMPRjEISnZ0HvDjTTlcl11ZWxX4KnepoIdsat+L/3kDw=; 7:LXeqM8uD/O3U06CmCX+OAb9pGAX7RVmE4rFtn39LYF3ZMDBx4TwslHKWcbd1aW8r0DerTXRS+48PFMk/t/UCMwbj3iH1RGcZkYwI+SjBDIJsALJxDpJGfkkfc0CuqN7wP3cHQTzW8OiRWIuG9u0AS3ZBnMUNPcLGix9qqnU/a05aGAfhEqOHP6lAMkvGl87NPaPcUpZLT2yF+zgm39ALkF+GRDJxSCzqonKW1McWddQe1cD2SvgzRIadFLJZcx1j SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1452; 20:7oVQQQkwVLhH6w5XuJsbW9VxojvXpVYjghtEcNHsnr+KnqVIA3Bs8rvXOZI4Uma3rawQqrddQ9FtR3eeicC14bov5HP+Wd+XhXp4PNh/DK5wbVQh14HMLjIvQBiuBCnxm4NxVPVbnTJ2HKX4LvNlkQyJubNDRnRqpzkPkeK8Hcw= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2016 09:15:27.5607 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: PS1PR0601MB1452 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/da7219.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/sound/soc/codecs/da7219.c b/sound/soc/codecs/da7219.c index 737e914..1ada845 100644 --- a/sound/soc/codecs/da7219.c +++ b/sound/soc/codecs/da7219.c @@ -1771,13 +1771,14 @@ static struct snd_soc_codec_driver soc_codec_dev_da7219 = { .resume = da7219_resume, .set_bias_level = da7219_set_bias_level, - .controls = da7219_snd_controls, - .num_controls = ARRAY_SIZE(da7219_snd_controls), - - .dapm_widgets = da7219_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(da7219_dapm_widgets), - .dapm_routes = da7219_audio_map, - .num_dapm_routes = ARRAY_SIZE(da7219_audio_map), + .component_driver = { + .controls = da7219_snd_controls, + .num_controls = ARRAY_SIZE(da7219_snd_controls), + .dapm_widgets = da7219_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(da7219_dapm_widgets), + .dapm_routes = da7219_audio_map, + .num_dapm_routes = ARRAY_SIZE(da7219_audio_map), + }, };