From patchwork Mon Aug 8 09:12:48 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9267223 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 7D3C760754 for ; Mon, 8 Aug 2016 09:12:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6DB6426E16 for ; Mon, 8 Aug 2016 09:12:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 62965271BC; Mon, 8 Aug 2016 09:12:56 +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 E856926242 for ; Mon, 8 Aug 2016 09:12:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751979AbcHHJMz (ORCPT ); Mon, 8 Aug 2016 05:12:55 -0400 Received: from relmlor2.renesas.com ([210.160.252.172]:8365 "EHLO relmlie1.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751280AbcHHJMy (ORCPT ); Mon, 8 Aug 2016 05:12:54 -0400 Received: from unknown (HELO relmlir4.idc.renesas.com) ([10.200.68.154]) by relmlie1.idc.renesas.com with ESMTP; 08 Aug 2016 18:12:53 +0900 Received: from relmlac4.idc.renesas.com (relmlac4.idc.renesas.com [10.200.69.24]) by relmlir4.idc.renesas.com (Postfix) with ESMTP id 2320B59277; Mon, 8 Aug 2016 18:12:52 +0900 (JST) Received: by relmlac4.idc.renesas.com (Postfix, from userid 0) id 21127480A4; Mon, 8 Aug 2016 18:12:52 +0900 (JST) Received: from relmlac4.idc.renesas.com (localhost [127.0.0.1]) by relmlac4.idc.renesas.com (Postfix) with ESMTP id 1B1C048014; Mon, 8 Aug 2016 18:12:52 +0900 (JST) Received: from relmlii1.idc.renesas.com [10.200.68.65] by relmlac4.idc.renesas.com with ESMTP id UAA10830; Mon, 8 Aug 2016 18:12:51 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'208";a="216936876" Received: from mail-pu1apc01lp0016.outbound.protection.outlook.com (HELO APC01-PU1-obe.outbound.protection.outlook.com) ([65.55.88.16]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA; 08 Aug 2016 18:12:51 +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=ZrntbkcLTIXbiU1RKU0LWbR55FZ2MY8hDS3HAMZE2Es=; b=lr/n9zufZvM3FbP9N5cEuKfqsx3GdRwJ6ryyaZN4Dlwbhu6tOgY2IiMm7Zeq+GbU7KgoEDPcwx549uNteqipmHJUiF/8drREIbSwcenJ+kCVEzoYOTx1UC2QCecI5lcSYPXpa+54ueHP8byEIGj3eF34UPjOMmpfBOB35N1nGfU= 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 PS1PR0601MB1451.apcprd06.prod.outlook.com (10.165.210.155) 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:12:48 +0000 Message-ID: <87oa534ona.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 081/159] ASoC: codec duplicated callback function goes to component on ak4535 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:12:48 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: OSXPR01CA0035.jpnprd01.prod.outlook.com (10.167.143.147) To PS1PR0601MB1451.apcprd06.prod.outlook.com (10.165.210.155) X-MS-Office365-Filtering-Correlation-Id: 05c95e9b-ee08-4cbe-9701-08d3bf6c2b44 X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1451; 2:nogr0BP4QHvGeYigLaTL2SXqo9f9NymwVeOFYwLMY9JFF0Wcehbqb0QWKCw9BPnpAqa7tRchGiXF3SIlJa+Jwjyee9PfvWo0mSkGtCEXINcPO/3PLwXyWWINFb+ObbseJV/gfBjVHRFq8bOQicWsNxLLyGkA9kbXBEObPwZpj8ZA3+l9tZdXMoHA3dGV9+yx; 3:VtXPNd4DZiANm95s79acC+TmHDmO1mOdSY1x7EGdD4Fcljq21vW+sdHgrd80BEcf3ugIanjKPuTw8hWTSjd/PNJzaHRrapk7soqX4JAj9xmfcpRJv1bmRdhPH2OS660p; 25:0kfhEm5Yg22C9GO9n8WTX62Ap/dEp/veVD7HsE2B8K8WtWzFXRdS9Fukcc2bErN4q2YGSxAEJdHG+wdS+IkBoVwpuJzG4GKSy4bj3+AX7eOjxzcHvD2LsAUPzApyAQ2KEkLVwlXFVungAAchn9a3HsTgUYmkkZI1/BbfVKj32UdfY9bgjahvlfazC9x2bWjsn3FXqpVOFBZmFP2kZ1k/k1Hva0sjxm3mSmOP0Nf216Y/xUDbWZB/IwB53i2gX6aM1DmluWhwMe2gm71v960SxPFU6fZg8MD2vgrt5k96yAqBhX6ptTJW7K68Dp30rjlZ5yLzVtHvLwgBs5Aa5wLkBw2Pnqc/RWT6u73a/bfUaQG+WWzn0kOJKB1s16C18xIDHzyUlNup7Bcrf7jVtzOfFEISA3PSdTwVeD9jxP9YX/4= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:PS1PR0601MB1451; X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1451; 31:rPPI0JnrWFg7Qh4OJaKkxFwsakUb6GMZRwgUajcK+j4SH8yeed5s1ihsetGxgwKZc9kMkUTyuBqhOO3RueJTSSYYrR2xiffehZrlxno/emmmuCnIsHbxiI1Nyac6SosApGlir+MCSVODxbUkky7ZthQGVBjED49+R1YONjGJtvGHAjsITvxzt1VfNLISZNZA8B1T2uCfXXYxV1rFi/LzwdUA8pJ/P7gr9FBrfPotIKI=; 20:TbcteDbRx7tZU+1eXoA3fxGJiQ9zboJzOoHEBzdhFV+f11+nMrzELzt4nW7whK7UPd49FBDJmbS+N6b01FHgTLHlk41iOoWMJ58ZllLo1vSeEmjeVMfNDhDeKaM4qsdFH+89Y3V4TbbJCCGnzXqomILvJ58uSlCurP3nIlAc4aXFWNxijNyQy5vk+tn0829w8R/2ynW+1rM2rqMvJVsdq5uhvArI2A8ek+Q8+lxWYPaaCW19F5H1X6JRFMdFfUGwN9PY/pMVArpM+NgByRq3OjfsOx3kH1xd0hTp+e273juzgjZXeNy//634kwRDU6qQWk/HRQ85TFhTadFE4m66pCDwI6XQakx9E1NFv5ENeGrqbNb7G3vpeQKL8fqsZgEudtdJQ2HIculsVEzMqLsvchiWfl50R9/052Jyr4DcRdjSmBufcl1j/Osvv0OhyOe1hWVkVJKv9VIx97PPXc1X3P67dCX1V45kktUgZrpZru1s5OfWvWPR62jiRsqhBVBx 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:PS1PR0601MB1451; BCL:0; PCL:0; RULEID:; SRVR:PS1PR0601MB1451; X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1451; 4:T0VDeMPvKzPIDOneAp637CQquqXBeTtoIxlX4mrFlNRno6JRuZamPS038iIUpeV67WfVduYiKYoTGEyYAWdwQu0ulMgyU2AQ9pOYCtNby9ko1vFiD2Gaxd5Vlx+oWR6Wqp8ddi9/aEN43TZxbUa6q2+p04lT3gBNRdUaK3sjxf+UF7CgFZW80QdX866348z3+dxCHoA3jT911u2EOR0Ohb73FZJXvHe2H2FtSTNAQAwMJ6MDkCeKK4lAKxz0n9wgiFH11VRqCpAXCGlcIusMyfWxBlMbzUKnuc84GjRcoWQc0xtleur4PSJ7kLBRBKQynSy1UHhTVh7t1VW3ctlu4AHHKyT6zpb41cmr02iTFqXZIfThd9bPFhuTa7901bKhP+BqJH1MZFf8V492Yz+slA== X-Forefront-PRVS: 00286C0CA6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(199003)(189002)(229853001)(3846002)(50466002)(6116002)(53416004)(92566002)(19580395003)(77096005)(8676002)(68736007)(46406003)(81166006)(36756003)(2906002)(105586002)(19580405001)(69596002)(4001350100001)(81156014)(83506001)(23726003)(106356001)(2950100001)(54356999)(586003)(47776003)(97736004)(33646002)(7736002)(42186005)(305945005)(4326007)(7846002)(101416001)(86362001)(66066001)(76176999)(110136002)(50986999)(189998001)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:PS1PR0601MB1451; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; PS1PR0601MB1451; 23:JlTRr6hcq0o1279XL3Iu2DJS1c2heeGChP3kqFF?= =?us-ascii?Q?l3avCRGyJKF9Qw2ufH/s2MWCG5zNnJii66iUZs0Jjd83YbnjQVd2dxhraNOU?= =?us-ascii?Q?U1yki1/r8mGBo0XZnEHhxEe1y3stTlXyP36ss8O+cKgoE/DCBmzuGs6/rPBz?= =?us-ascii?Q?pOuEz26b+mXbSIK7TK8fN4atNEZX7uT72ebDHeGYwVzyRWRNpJOt1ecppftI?= =?us-ascii?Q?xoC8C+46/FByD5jZw7xlfSi2Q7tqE1MPKkQu0hOG8FJetiK1FkJst70+77xN?= =?us-ascii?Q?kiekTzt+hJDB6GqITAMibgryfqnpbbdLX0eOVByABGB+RYlvkzFg0JodT9tK?= =?us-ascii?Q?WcbhQCsypBM7Q39lRiOGXPNnXSu3hflyoU8i0N9Jry/muZ1Zo7DRlTN8S+5b?= =?us-ascii?Q?dZQ+P51yeqvzW0a2hBAMs/n6agt8GeJDhj/+G//3RWryX3pYpUAUljDMy92H?= =?us-ascii?Q?lpZ1AJHtdeMbWFs4hKY0+ggtPydsBLPJQLkJv0qPUoAOXJqfJpHqNfT+Nmmu?= =?us-ascii?Q?pGCrGq0uHRNbrQDsu+N3cWNFBtJqvEtkg1EQGaBEsrbdmFH/bpMYW0W4Cl0/?= =?us-ascii?Q?5APXajLxSRwFx6moWh7cLB7HBgyp29IqUNjx71IkeNk9k/Dc1Wb5ndFOOCh9?= =?us-ascii?Q?bHuoJ5zT4DjHZv667NAB+eMlb3t3uBJwdtfQwSIx4rLOW4sYgxWQcjWyqhbU?= =?us-ascii?Q?uMgXvcXq+ZmAk2LM3PZvNnhjBorigB1LfKRnCKfIGoXxzDUwlpzT7zdI6wCI?= =?us-ascii?Q?gOj5/emyWLvMR2MLxFD6Pwi/C1IX5alziXHNhwnVk2P8flFRMAejZjbb/Og1?= =?us-ascii?Q?VYjQq76ACwM1thY1aX/HCjuMH7ewcaR/fx/rdEpgb20a/LI+QBJ9ECF2cdKF?= =?us-ascii?Q?ypGpICn7aUp1U3gZy68M+bJxr6XnGLyFViEYvY3V5/apIozZ5MtoyzNl56yy?= =?us-ascii?Q?S2ZwDqFXPL+8pHrszoie23YOFtTYZfb15j0RCTiDfSIngwJo7VoLkpD9lHe9?= =?us-ascii?Q?y/z99/9S1/W51ywNJTlG77u/oYv4/xClQNt6tdP+ABZyElB5qX7g3tBoLsIQ?= =?us-ascii?Q?eowW6uuTUhLQHYRxJKonPy8cf8C7U510BtX39dhhGuB17Dw2Doed0h8OxyM1?= =?us-ascii?Q?W2NUq/8MgPrjKxIsu/7nXNGJ1wBIeoeHWrQ0Lc1Pl+vmMvCSwFbWBWg=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1451; 6:RSnLbXtp61kK6MTzGq9H1nXeNrDrPRKBzvwRjfzcYNH1wXvoKe8C+t41SUkQAIe4+WayBd83UtkDo5GBgkjBtNNCx2/WioPJwjXk+UkUWRZUPnPNqNnbHPr4yeu526c4rlBIiM3Q8TZ/u7F6Q5MruBeeoTGqqcb663yyUaPF+YzEbdSQKZQHQw0reqcc+wk6HIsEIM3z+j0dGG3EgVSyBTwqgAOS4Yx/TFTrOnC+0cDdclXK/XVk8Mw7EmvHS1iPAQ+UUlJ8v8D4aAExzYx6whbgdeVy1EQURfYOdAHjB3HXP29kYai0SncAcTqF2KqFM8qKLYZjLsuRdIuRe+ZtWw==; 5:deLTHl809CPsxxQ0RifuXmXC6IP2PGEKhp4QPNnbrAOxAAxOyJnW4tv0MaNN7fmHGRZ5f+XekSH21ydAyT/eKyq3DLGOtoU0rXGfskr+WTX9edzENJjFJQkmQYwjj2YhvbgvmD4bezg49Nlw6OyIsA==; 24:M/hew1Ap0O60uODGSVdIdIoziA2xRAQbK12dqmntS+0bkFjEBjRyQe1XUJeP9iD678IRTUJj7bOgH7u/zGqpdh+1ZaWROG59EPI7LM3Vh+8=; 7:6XrWdKEdJW4gdbOEt6yr1rGqRXwa63KGX6wCmbeN6TYt9z7SoPcJVNM6y0/6El9oJy5/y/eFggEAAUOPWJHrN5YaAXLteNSReFzZHGcOi+//Kz6x04TWuCjjCVRzboQ2fZtnCvW138SKtjlx9Yutk5LMI1onv9rffgjVGB4aO4VzUA4GQ4rkc8tM5ZVw6Wyuy960fPqV+gNsKqLFCdTR/Xf4ALZvQFjHbYh+OoAtSb2sezf7kJaWSeRT3JOFtd74 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1451; 20:PQ4VYqCz/VjJyeSrYPQnZGRlnGv6bicpyJwb/fi/NnpRcb/owr7+58n6UeUA/tpAZ96u+a0nDSN21e/w8WAj2/YpC38QTNxumaOy5vggxcKDpR9lQ5XOO8bu5xa824uTWFJW33xAaZ6QRB6JqRDNgKiFkiInNoZKUH18NZXkyAQ= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2016 09:12:48.8066 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: PS1PR0601MB1451 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/ak4535.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/ak4535.c b/sound/soc/codecs/ak4535.c index 54428c6..66cfffd 100644 --- a/sound/soc/codecs/ak4535.c +++ b/sound/soc/codecs/ak4535.c @@ -395,12 +395,14 @@ static struct snd_soc_codec_driver soc_codec_dev_ak4535 = { .set_bias_level = ak4535_set_bias_level, .suspend_bias_off = true, - .controls = ak4535_snd_controls, - .num_controls = ARRAY_SIZE(ak4535_snd_controls), - .dapm_widgets = ak4535_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(ak4535_dapm_widgets), - .dapm_routes = ak4535_audio_map, - .num_dapm_routes = ARRAY_SIZE(ak4535_audio_map), + .component_driver = { + .controls = ak4535_snd_controls, + .num_controls = ARRAY_SIZE(ak4535_snd_controls), + .dapm_widgets = ak4535_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(ak4535_dapm_widgets), + .dapm_routes = ak4535_audio_map, + .num_dapm_routes = ARRAY_SIZE(ak4535_audio_map), + }, }; static int ak4535_i2c_probe(struct i2c_client *i2c,