From patchwork Mon Aug 8 09:28:43 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9267449 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 6D337607D6 for ; Mon, 8 Aug 2016 09:28:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5B7822679B for ; Mon, 8 Aug 2016 09:28:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4DABA27D64; Mon, 8 Aug 2016 09:28:51 +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 A1EAB2679B for ; Mon, 8 Aug 2016 09:28:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751670AbcHHJ2u (ORCPT ); Mon, 8 Aug 2016 05:28:50 -0400 Received: from relmlor2.renesas.com ([210.160.252.172]:62452 "EHLO relmlie1.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751320AbcHHJ2t (ORCPT ); Mon, 8 Aug 2016 05:28:49 -0400 Received: from unknown (HELO relmlir1.idc.renesas.com) ([10.200.68.151]) by relmlie1.idc.renesas.com with ESMTP; 08 Aug 2016 18:28:47 +0900 Received: from relmlac2.idc.renesas.com (relmlac2.idc.renesas.com [10.200.69.22]) by relmlir1.idc.renesas.com (Postfix) with ESMTP id 98C6B518B0; Mon, 8 Aug 2016 18:28:47 +0900 (JST) Received: by relmlac2.idc.renesas.com (Postfix, from userid 0) id 881882806E; Mon, 8 Aug 2016 18:28:47 +0900 (JST) Received: from relmlac2.idc.renesas.com (localhost [127.0.0.1]) by relmlac2.idc.renesas.com (Postfix) with ESMTP id 6EAA12806D; Mon, 8 Aug 2016 18:28:47 +0900 (JST) Received: from relmlii1.idc.renesas.com [10.200.68.65] by relmlac2.idc.renesas.com with ESMTP id UAG19604; Mon, 8 Aug 2016 18:28:47 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'";a="216938123" Received: from mail-sg2apc01lp0242.outbound.protection.outlook.com (HELO APC01-SG2-obe.outbound.protection.outlook.com) ([65.55.88.242]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA; 08 Aug 2016 18:28:46 +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=mnvGu1K+b2VngvxdnV17tRM6p65LyWksYwlG6f6C2MM=; b=mnWH1ECM5Zhq7EQFsBUknb+DIOfZ7r9V9IGV1zvoBLEu3Z+YPlOn9k49bV+qBw4fvLuTbMbtwnfTYFA2y0w75/e8voRFG2r9RGzygLU8Ha/fcL8ENCoDWNLyGyNvRf1cg2EdQQsvu8u/H+/CqPXRrlPXuiy07m5WcOnZYgxUh3o= 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:28:43 +0000 Message-ID: <87lh071urw.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 133/159] ASoC: codec duplicated callback function goes to component on wm2000 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:28:43 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: KAWPR01CA0039.jpnprd01.prod.outlook.com (10.165.48.149) To PS1PR0601MB1452.apcprd06.prod.outlook.com (10.165.210.156) X-MS-Office365-Filtering-Correlation-Id: 0e109a19-d221-4092-da23-08d3bf6e6408 X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1452; 2:GKze2A7DjZIQ43/T1rkX2ns8ybhR2wc+hSi3bHP7xQPf+9/tsmXOEwZv1PaR2e11vxsS/5Trg0YwRFwVfNQKraT40iGE/ZJudHo4Jm0sLqUszspki68Gt5/WFM24dd7SsPkBn1BAR3EaJ55CN6o7xQaaG1jEnKvxkcxuyP6hwrkMVGJYzAK/lhD9VbWKuvhz; 3:8Lo7UmgGCuaV4f1RYN0MWVwM/zItgqLed8FF0AlDPx0EI4sb6xAoIpUVtTkPgN3cFXCYlF/0C1LnH58Y/wbGURsRkTjNvfKSNKLZxWQlFY4ZclvykNwf7nvU3cMcgda8 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:PS1PR0601MB1452; X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1452; 25:2najYz+z5N2jBTcGEA4lJEHV7ZqJIeyPt9aczNcWBq2Rz+hBjjJ6HWCe0cy7S67sEDk7CPtIoNSiamjKkeDDS7KJzYFlYtTF3UKCkR3UtjZC2xKjcUNBTW/d/AsuxJFVpayKJATfuIz4mXi3UqNdtiukleMAwW7MaTOJhlZlB3uYhmwn6gV6/TBYVLkOQrdn5fE1QRriSUTN4+rxvLu5cCoE/v4OZm9sl4kUXbGcU/hQ1dIr4ajdvc6RVfRnxXJIk5ziU3VnRqAldSLZOaxvPqUQXfzlGJGch3XlCgh1ardk4BlsA9ag0ugaZ+o7IZknR3QnABaNNRckTRcNX1PH/RlaXwHu06uL0tY6vYZIhegm6gemm+orSK/qut6k61R1Rtk4oT1ZzPwYQVlQz+I8y2Lq9f3lVPFC/GutYyzp3Z8pss/SJLU4ToRBMj2QTIGFNk7ToGFIZBITdVmnU8xWlvTCb+gHPwZF4IhnnKZk1aBDV81mqoi2IDYXb6cSccsW/Gw84qkRICjAa1+u3YWv+XG58S0O2xPHE5ZRsF5D/Hx7rz+YY8d9LHVJNTJnN1R9u5bB7M1uzOMS2cuWmqQtLUD8cmHHftEi1sV9chISjK/idodfX13QNBOXq60drLXW0t/ItC1tm80bZcG8iygXC1wsimPSqP0JHOuY7zqUwNrCP5CCdTAK58+0JcJFtMbm0L6a15nYQX64/4j37LcTkQ==; 31:ladcZE/UIz+rVL7PmO3NHNlJlEpTy3ZdPsHYhLU6tERvR+a1WLIXePd3XOGjnzfN5t5usqX1gdWwYWi4wI7eSQYRFhQKDgmDULvXu0lwjf5SwF3fWVlS1MRyFxMS2m7j6W+dY0yYeZ2VWWlLdre2KAZbh8RQe7iUq36MjbWGilfdnME0QxRGO8p/v+K3z8HWsv/tuZ1FDCG qQRZQl46YlRlGw1X0fZQzdbW6GBlDBzo= X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1452; 20:loiMkeqqdud7zUcxQfnTAg/gsCDm/oODGp6TCyHA2AcHa/WWg0V1ORKsMsE9Y0qqhnPMr15Dx6w8UF0WIVH6Bf6JRfN07sEOyaWtBXo260z/O3KzivZVz89GtgyaIvdtQE62OBJdq8fa3QW8eo2Q4rkbU1uLa8JGSMun+YIw8jwY9FMFvYRp35ndjmzmJIYYQ6X8+CSeWfje0iJ9LLAhGhuoxC8ILOwvHvHg0dbueV6i3f44cCxfD7k+vPweFrpaVIOK5NUmCXmNcQyelAG+U13p22qquDUIpupHBzvYOlr21yEPWtR/Ntv4IRPWwHWEuj874pFfH7Eje1FpPAQQfIs/PkW9e7EoKCU2CuWkyI45puvZVJWNMa/H8PC+K1H3eU/440wFbnjKK5QoNTdHu8NKom0OJ5LLhA726JlICFmFyNWQ2u632ElBj2G+qGO3jPppZy1+mU0j8TvZQuPf477W0lLWKcLBV8xtiCg/DaHt4IwDnpNg71md0gQyRdK3; 4:2e3++N3m6eo7HqIJmMdAEdhSa4hiGNB8ykHIRJj0sS/XgX/vmhv3pvB/vLHivvJCbe+bIXzp0n0a/+Y2lyXPd8+1Lc4Zlhb1U5l1spO7fus8rlOPQSR8i4pC7kFHRK84seRuw8HUXOuNEQMlhIzd0z8qhWVyra4Z+w8RIb/LyTJsEhopu78nnl6ThkcbmVeRt345FX75D3ZMrgYOWDyoFWkDcIaeRug4KCrc3mNS0sYUKlLV8U+pOmWz/8D2nmNOnYfAot3UxH2I7+OI7IAAZW7cTAqNDkwUwQ/8wpfCR/qH0bV2Nhro/7B6E2lu2fp4bfNYLDBV57ipmQwgkd/HiFZAmjbzqXU3f2kNGQp0vizitebBdUov5MMMnAdPCdMwDfpS1OeCC1e2WRth7MLjCw== 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)(199003)(189002)(33646002)(4001350100001)(42186005)(36756003)(105586002)(83506001)(19580395003)(19580405001)(77096005)(97736004)(110136002)(229853001)(69596002)(189998001)(106356001)(66066001)(47776003)(53416004)(50466002)(4326007)(46406003)(76176999)(23726003)(3846002)(54356999)(50986999)(6116002)(86362001)(586003)(7846002)(7736002)(2950100001)(81166006)(81156014)(68736007)(8676002)(2906002)(92566002)(305945005)(101416001)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:PS1PR0601MB1452; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; PS1PR0601MB1452; 23:gcMGYHPNJy/cZv86xeuevAfO5tMev/J/WYFbyiF?= =?us-ascii?Q?elcZw/igBNVLkwRymKdoTSsYJmcG9H82E0sjEYAGjpBk1VXUuvmxuG7wa31g?= =?us-ascii?Q?IBwh/Fn3Q2FKUnvtcITb911Ld/U6v0VFG1EuKC9cpCkbh2w4tHbcnNd39/Vt?= =?us-ascii?Q?j2Cy4MZj0dKYgW+ac5OQn6A4niMe/gPEKfn4T7YcUWhuPqrsjzooz09Xd4Dx?= =?us-ascii?Q?lUIIG8XoF4SpbSQtEeeSBExWJcHvuyh+qjY4iLRnDgvyKuiBCW1Yfhis7tQh?= =?us-ascii?Q?xSu47a+/vXHygBMbMEDRvoeykUwmB4Fj7kQqDU4eEQKn7nuGg2aHrR8AlRdZ?= =?us-ascii?Q?ZkwHqB4kVhBJmrI6Cg2VdY6PQE5+igzEW2Z33omAdeeQM5l0QvvAMXJIzbKO?= =?us-ascii?Q?GMGjMsVo7GzogHBfseIKotfCnUdPDWzUVTDSYx4epm7wBB4gdiWS5tYY5CbT?= =?us-ascii?Q?DbKTJ7m6Prr6nFjB0G0id+FpA6zbTATxaU8zLC46dy1CQpDq8N5vwUZvidBQ?= =?us-ascii?Q?af+NFHjau6DSKJ37xXbT4ABIl5ckJNSPIcxHSgZ1mh6o9B6gSvQHZB9zPnOz?= =?us-ascii?Q?68w6rCy2aCpwqJ7vDUkXubsd/3xhY7eyOGel8yr0hX+f1MNaSEWkM2XCZXMm?= =?us-ascii?Q?poT7CQKIWTa3lB+9ZvWP0SMg07+M0WUD624L3KCKC4iKT9xzarrW+lv0LXto?= =?us-ascii?Q?OlVECHTRwy0T4y1t1USSO003ZLI85aek53buWn/BtiUXybswKseEENTCSxtV?= =?us-ascii?Q?3J/P9vyItthvmlETF1gyIfo8Ec5LfnAqtfbmv3tHGQs8G4Yy4/Fr2dAfXFim?= =?us-ascii?Q?AhPG5qcup+hlhoZdbKrsNvqqcBvHRJPvzS63KP2PabdCLIRkBKZpaLJJjOBY?= =?us-ascii?Q?GpG1HNJpaSCb4N5a0fdfLFumCIZwsKaQiyiwF5pfHeP7ijj5j8dadtUUHWIk?= =?us-ascii?Q?sZupsI274Bm7wTAk3fh2FDDAtwxps4xCoxKDZD2F/SswP0c3egppVamErIbS?= =?us-ascii?Q?gRBJ+arO4c5rNIGf+npgT1JQxoESIVXs+EB2Jo2u8+LhZsQuyg+c/TCgCCUL?= =?us-ascii?Q?a2kZJrEBBxufaF2NvpviU6toPMuL/PNVVY5zZoSc4Un1i/0Q2WqQNa8lsCMf?= =?us-ascii?Q?lnB+2G8t+8ExiZlm93g/fPAEu14ebxZ1XvWuJpz5Bh7ZcL/QHOWmZnQ=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1452; 6:qp3JFWc7m1lnkQfeqbD8e0cjijkkClnmrGf1qUXHGSvVna9sHjWHFeyGbp0kb62JQH+cu6zFbeiJ/+A8q7/tWWhYvnmPCkig59XYPZR7Q1AiS7lBQbU3RY1aDaBDNSa+uTxdaZQiaVOduD9Z0gOk3NySZEZHCJFRim72CbgJA7WeQQfgTHEqODbevW/YYkT26mdLmtTjC5lf8SrbZb9X5I4ctJcurOKp7NVR34R58f1W8/lBQFmr16/hPqR8pG5+C5+o6bDcyN2F8miaVBkxc8pHpGwupXb4vqryicLNSLsLweQqsnCV2KnnV/JzjruIlFI/+4E01k8ueUPM+YkA1A==; 5:51xlt/zGSeo5gk5qQ9dV40Wc1rNu6EdqG//CyPLy68Tj6nijJv9rmRTx6USyFSlYmth+q9NNucQ/ehHXLPOf72clghatWm9LAsWU41jGNBUgZ07K/ESOhcYj5FOzg7fppz7+S53pnCGn9Bo22aYOCw==; 24:iN8noirS446t3UxPf0SrL3PVJG/6yyiVfGA1LG3JI5FI8RfrzEybKibTgZqVRcoImrSROtxQMW/JrgwbOmmhSLYSdasIzKyLBYVPLA/MmGo=; 7:wG041b9LZB8WVnyRu1bpYyjd57dWf4wHhHHOQ8Jn+9z8+yphG0XPkExtID5f7LR9tP3Qv9LtMKRxUMvI8mU+0EowDyXPgkn7QTfu5xMyaVg4eZ/4bwZbhIZhfDbQkJA54tfxsMHb406KpHf6zgJPmP3hZWBk23PBkUhHEOlWLqOxLTdNDMZ8doXaYPjhsGpX1ibeVGQhEFsC+IUgFgaV/3+37Wfy4yZAGQ8Bu8DiQpbsL5+kiKjIqWuzKQyWaXK+ SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1452; 20:lD7XMxwgO/z1gKYbjlScOkXr74qC6u9XrJTcuZbPRwpgghzZKINNlUXmxczqgyDvM7OAe2Xd7rbbTFqyMCgujiluQ4wTSeTcTUp5kCFHJ7e7L+rEJ4TK8nBVmQsJa3O5AiD7JVIsTnZc1C1rq/zWZFwcrwSOfBOvIoL1IOE5aKo= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2016 09:28:43.1498 (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/wm2000.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/wm2000.c b/sound/soc/codecs/wm2000.c index a67ea10..1ebaf99 100644 --- a/sound/soc/codecs/wm2000.c +++ b/sound/soc/codecs/wm2000.c @@ -805,12 +805,14 @@ static struct snd_soc_codec_driver soc_codec_dev_wm2000 = { .suspend = wm2000_suspend, .resume = wm2000_resume, - .dapm_widgets = wm2000_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(wm2000_dapm_widgets), - .dapm_routes = wm2000_audio_map, - .num_dapm_routes = ARRAY_SIZE(wm2000_audio_map), - .controls = wm2000_controls, - .num_controls = ARRAY_SIZE(wm2000_controls), + .component_driver = { + .controls = wm2000_controls, + .num_controls = ARRAY_SIZE(wm2000_controls), + .dapm_widgets = wm2000_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(wm2000_dapm_widgets), + .dapm_routes = wm2000_audio_map, + .num_dapm_routes = ARRAY_SIZE(wm2000_audio_map), + }, }; static int wm2000_i2c_probe(struct i2c_client *i2c,