From patchwork Mon Aug 8 09:29:55 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9268077 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 985276075A for ; Mon, 8 Aug 2016 11:10:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8983227FAC for ; Mon, 8 Aug 2016 11:10:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7DA222808C; Mon, 8 Aug 2016 11:10:31 +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 83B2D27DCE for ; Mon, 8 Aug 2016 11:10:30 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 727592688FB; Mon, 8 Aug 2016 13:10:29 +0200 (CEST) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 3ED1726760D; Mon, 8 Aug 2016 12:05:15 +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 3B059267610; Mon, 8 Aug 2016 12:05:14 +0200 (CEST) Received: from relmlie4.idc.renesas.com (relmlor1.renesas.com [210.160.252.171]) by alsa0.perex.cz (Postfix) with ESMTP id C025D266E25 for ; Mon, 8 Aug 2016 11:30:00 +0200 (CEST) Received: from unknown (HELO relmlir1.idc.renesas.com) ([10.200.68.151]) by relmlie4.idc.renesas.com with ESMTP; 08 Aug 2016 18:29:59 +0900 Received: from relmlac3.idc.renesas.com (relmlac3.idc.renesas.com [10.200.69.23]) by relmlir1.idc.renesas.com (Postfix) with ESMTP id 67D925197E; Mon, 8 Aug 2016 18:29:59 +0900 (JST) Received: by relmlac3.idc.renesas.com (Postfix, from userid 0) id 491C01806F; Mon, 8 Aug 2016 18:29:59 +0900 (JST) Received: from relmlac3.idc.renesas.com (localhost [127.0.0.1]) by relmlac3.idc.renesas.com (Postfix) with ESMTP id 422FF1800A; Mon, 8 Aug 2016 18:29:59 +0900 (JST) Received: from relmlii1.idc.renesas.com [10.200.68.65] by relmlac3.idc.renesas.com with ESMTP id UAL28636; Mon, 8 Aug 2016 18:29:59 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'";a="216938226" Received: from mail-hk2apc01lp0207.outbound.protection.outlook.com (HELO APC01-HK2-obe.outbound.protection.outlook.com) ([65.55.88.207]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA; 08 Aug 2016 18:29:58 +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=XZMAFNGx21pS90m/TDgjIqoRSxP0GRLn33QeRRcF2kU=; b=iGFBGhYBufG7Vd0u1/SmWOLZYzicmr0ADELt0AyuhniskEOLmIDzz1tqISh53KqnEDcwgfO7jqamYGhsACbpt5Hs5fZ1MKqYskUQUSwnpQWbDbNa/2Cl/2hjbSgDmstsPpTJbwfRvLGT7e8kE2MMUioQqDll2xyrn9j+aEl2cmU= 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_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.549.15; Mon, 8 Aug 2016 09:29:55 +0000 Message-ID: <87fuqf1upw.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:29:55 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: TY1PR01CA0063.jpnprd01.prod.outlook.com (10.167.153.151) To SG2PR0601MB1453.apcprd06.prod.outlook.com (10.169.106.19) X-MS-Office365-Filtering-Correlation-Id: 7831e7dd-7776-446c-0fd9-08d3bf6e8f7b X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1453; 2:HlsWWZk88+0a6UgtbdFW8mQyEwll/N6WodcxKJ02Ly9jaqpaIDDqH7XMndOw789bEDG2BkHcYg5DHPY+w6L+cW4UzakDfbybnhBic/jQYrmyBNTw0optZ0FPs3xRtOFZLmswm5mdj2xQ9+Rgl6pjxrB/NJf6z4KJMLJ3KW7swF4hJzb4nphfDgC3LHLj27X7; 3:JzhC4nNEsTXwBIpmvIAno1Y9Knmw5nkIFx43P+tVuLBeEmggE9RjFf4fR/Q30hF1cfCYmzKDZZz2kPLLoirgeS2Zno1iJLu3qlWEQO7+UmOb8vysVG6nTpHSBP8xmajM X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SG2PR0601MB1453; X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1453; 25:tckZTMOhTXFgcaqv+87g+ldo5vD+vqqgdvtqxaiIS+Q1O1Dxbdv8Bb2vW6uDP7bS6Q66o09h7JFg3bUbpYZSWBzPFrFGZmKrPCLDGA2Eg55p3/cnJne6tVWjEuHqbjotRe0cC6SXiQ1Be6Eamp2lw3XyHkv4o0uBEYqW/08Ea3X20t4vjEzPqhj36UzKqkgkIpXdpLZnuFNOa3eMReNDOwgq+b7ulqo8i8xqHi5MoX9iilIgCoVx8xs2iodRYqfuwE+MqntqovUGnuPkqkgPF2Vr3ubjN5LvQim3LAD5Bm3FMQMPys2FgPNqxCJaR/29ts6rnhkrd7lvhzL4B6j71azLqOdV3zmhg+BctqvEUuR5yDb5f5rSt3qj/ZyqriJj9NqkBFjm24OfSvdugia0s2hI0StKli4fYvShQTUsEieRMoXHtikxbHwGa4paJmf01/YUV2dDTjriRDFmH8mXIHDPpxvsSGpMD84Ts+KUVHUTz8z0Q9WTpghgpNzCYpdBEE9F4hTn5L3WM0lKbemm6A3kKHR4Blw3AcoK75dNL7C/mDbtuJNXywTw391tNq93L5SmGhZiY7pvaayt5nGea8K9wgrnccCEMDC301isEB4JZPnAnJ+eCtwr/HFccq/CaRo2tHs9B2qzBgM/tXov5kuUIJ47iXZG7USFJF1EZUtT/nJc21ft/ONQw4eqI4OB; 31:i7qWLeOhDZbmgW8htnRBZ7ubEkJvXZcrkheLpnyk05F6ES0gSNe0vsRS0CQClFW3P/3q+EuIcxYmEEPjGqsq3hWuOPKBx0Y0uBEZVx+Q6gEKLTOnjdCG2oW99/GhX3F8+skfa+gka/UnNFS+d0mfGXxjLHJyaxv2VfstO9y4ylswRVzyGKi7XYjycH3A8iglkLiaiDw8QuQFCgIZFp0ELH26n5IADMe6t4ngiq5uZ5s= X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1453; 20:0a+tBZu+cnK4b4DBq9K50v8S+c718HuHh0m41hewWoO9tt0J7N+H05mc2Q/43z4c6CuQLEFVGDxhJ0jNtsSGZ4K3plOG2/qKJP/5qFWzoZKHhHzX7/24G2qDzXu5LFYip1qUcmfxu6RXO41bEXKdaYA0GJ79iPGsys6dWWRAsWi70WndH0/C8T1TdoSx80kFek7yh0pD6okwDq/q0xZ6hyvsyox72QFPeVs36Gu3MumlNn7lpm2bGqXmgCD/ghyckj3vZ5I8dIfxZveMU7mqdz9WlYnJWJRRlkkJyFIaN74/40cMVmCMBifIswl8W1bL9hu7a9ASO40EoHXJRb2BOsAngIsSFyag3hsHjo7GQpDc9nRUeAEZwfY8GdGcHFm1y1Siplqoq3dyY69y1L3/1QDmMXpLhIhIGrxZKWkMt61s244r4w0ZHgv+8mFOH7Ovw0gQpuNIUNjDiYY5S+9c1ciXbX2qF9AmH9yWBocaWgVtim3Ci4s4AQ/lOmnfwrdC; 4:TbbXfZv3zzYx55cwUQetBhufr+ksoMDfST9+5N8VCBHJER+2M2fdzQD0VrUK4MGvT7olXSX3Yqn2u7KD3Wm+CbvC8NpWwgy47C6tIj3mLlHMYEa781x/IXw37qpcBMdPZ8N5J4L25MCVqT8qT0JjP2TRWopKxeN7jk3RdN+/Mb5VGInwprAZjvZ3EFKPa/2oKBtXoPgsJKLdw6I+LayLwtofiUbjt/JFELuwpPK6er3Oj8/0qnrJxqdrAGSIVBvA2FHApj6hyx3ZzG4rr7BLARWd2R2spLzQ4kUG+DJzcLRkAml3N3ITimHqFDqj/DzYDTCmtD6n3T7Y9lrUUQ058jlVhEpkv52PXp104E4Wz+d4p3JLqYYQYqJwv35L2UdowT2VZgwAPTjzW3iezkinFQ== 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-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:f6o4slYZQqD0BZgvEtmrAOkQaWv1K/viLgK/Hb/?= =?us-ascii?Q?6K2KEwWrcG4LIlCxadII4mCk8VOaIkRUPvaZB37GiM4wypB9ZFiYvJcU7dWJ?= =?us-ascii?Q?MZTLNbTWgC0+QtqFp7hoLjZfgLKzeIu9vsHav96qByjGiNexQDV8hjHpyHCF?= =?us-ascii?Q?+fVNv3PJ+lsH/ZlC5WXQ5lN/rXgiMuS2f0pbmAf9PAFDQNrtd+q7ECY+6oGc?= =?us-ascii?Q?3aOxqrXYE3i2gRUQMlEk7lIfCdouSA1C1mLGneyCfEe5VYFUNZL+yHEtVaqE?= =?us-ascii?Q?1zB2vkxlxIJXElqSxEGM7Ac8sf0JVKQcRf2Y3A+y+pPPBVtE4QKpzVy1vQXU?= =?us-ascii?Q?2OpkUDH282kD2WxuyFubbLz8T4IAlliFr50w3HzcXlxIr7ztafA7ERzQ0qrO?= =?us-ascii?Q?Jq6B3c+I+s24RUBaVhGfEwwth2FRVYKHicD/buGpCz+aoTPoR7x4AuY/xZn4?= =?us-ascii?Q?W6HprU+cPGwCWUl/ebJw9WpMmILDUasgcgDmMbuv2rBBd3e69WXCCkUJzn9Y?= =?us-ascii?Q?1kmcd87DYm9Ws0jI7sMoiABBWSNlUQP4B5EOL4WLxVmDgRlHIT7yZtY5XZms?= =?us-ascii?Q?W5CwQczYbykOQwzN5NZQLoSrAlnSEdoiJcJmqlsIckLTLlYlcqswWFoOkLzf?= =?us-ascii?Q?YUbqjZfiyR7NYZcfJW6TPn/FHs690xA54H4tEPoR0OnUEIKgCGM85S8vilTA?= =?us-ascii?Q?654jDfietejZt8RFjfYatS0Bq8vMsgkvz21G8Glm3xKNmT4eKMb+FWcaybsJ?= =?us-ascii?Q?aB4guBxUzvgpyn5Sp2FexdexcdLhE6IxKhs4zO7frgDx5Ff7BJmqPzPkhlWh?= =?us-ascii?Q?ocslV0Qn1tl2G84Zv9+ZpTGywxO9cnEKDmBup6V/Gu3FCpVcrNIw0spQFxmS?= =?us-ascii?Q?+1QTJt8p6s0lOTwwlHrvhV2EmpwY59iiNh3RpyjVm7YpcXUR5DaIWHZBP6fL?= =?us-ascii?Q?IEplHhKWAWzFJ9oPIu6llT3zWYlkuYiREemgP1y4D9x+j4sIxui14iUhturI?= =?us-ascii?Q?v4vp2rDNt6P6mqbes6t6uCNejuDXqaIwjkyKy9tCxnM6pSF5AnCTOX7Pyq/i?= =?us-ascii?Q?zuCsMV/luQ04VitA4XK6uP5uP2ENyXxnMSZYJupU4y3BkrXeiHNVtCH6+Hfk?= =?us-ascii?Q?vbviJFXZ/f5dUx49iAVrU7gwqEVA++6C+n4dK46AN7F4HPKH4qbk5Dg=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1453; 6:Cq8dcLG+DGtXheKzqLH1Tx5WnzzpOpfajwJSOaTn/J17ggvoLeEv9yLY3Kf+IBfCyDo/fAFKpkafkh5rSvbI28iq8R0qW5yGWXoydMO4r1XzXecSGl6TKfP2rm5l3rBBFN9PGIBPYl/rauWTBNWL1N3eBONV+FfCz7Buj8cHYx0Zdhs+aFKJLcJjD92zy3uo59E/k6iWMJyToOhO11WldDiSMXGG8Dl33cOaZ4qW08kwBRfr2CumItUMuSk/ycMtShbutaLuTEpBrMCGUTNpGqWLgB5EqlEvTJNPQSkhykBSnJ1u0fCOTWwYkp19Zc8JTxslDnXISHIky2glgSyCZQ==; 5:pLY9zGLknNNOewNjb8NF6eWgBPUqy1UeXbGY8aD1igSfJkIU9qUhJaFJvcOtgN0Y16S14iMo/xdX+YPZgTrno4/TktrYzxETCmhgn3mcE3MoVf2iLdoJSA/DkCNo6bdzE15YTF/LJUjbPH+jjPluLw==; 24:fcXIN9ofDoqyidO8Ad6P3zzZS9QI+BNMVcJsjnrrbEAaiSYpLq6cnuEvBZfH6Xm1ASgAKCsZ7bQBlQDxX46jXz3465C2+FNWqbBqOVMSZB4=; 7:scWamYZZAojpkVRbyM6WFdYxc+KfJnmf5B3pqVU3tUQx1Phvmph1FEWPjkxLFvc+bFSD7/J4/XwZzUV9CRz/yH1Az1jITD1DnaTimtIbjwj3mq3jhrHSXCAE20VNdyxbRvyKSQOdlGLNCUY3ILPQ8dvsNtO8wnOQriHu+dtndweshjSOwVQ5DJ0KV1YkyA0fGPWxivxaHyRS+dl5GYdSTFb7EMGWLnI+L/8X/rBMOINu+O6uFKRqmqqoZa8GZj01 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1453; 20:DJaFcWf2+97sAXXDy4NARvVtXJi/zzidCiWivmwSTvO++SDeMUmERlEj+qCb/Rn/lozNpRhdhbUBFn73V9ZtofPBka5iWwQf9h+8qCMsKNEYcMEnnkekDOwt8Snx4IocCMrs6FOfz0L0/UYIh1405x5ruellyYs2L0KxGWxtmnE= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2016 09:29:55.8512 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: SG2PR0601MB1453 Cc: linux-renesas-soc@vger.kernel.org, Linux-ALSA , Simon , Liam Girdwood Subject: [alsa-devel] [PATCH 137/159] ASoC: codec duplicated callback function goes to component on wm5110 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/wm5110.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/wm5110.c b/sound/soc/codecs/wm5110.c index 1565470..3e7f873 100644 --- a/sound/soc/codecs/wm5110.c +++ b/sound/soc/codecs/wm5110.c @@ -2357,12 +2357,14 @@ static struct snd_soc_codec_driver soc_codec_dev_wm5110 = { .set_sysclk = arizona_set_sysclk, .set_pll = wm5110_set_fll, - .controls = wm5110_snd_controls, - .num_controls = ARRAY_SIZE(wm5110_snd_controls), - .dapm_widgets = wm5110_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(wm5110_dapm_widgets), - .dapm_routes = wm5110_dapm_routes, - .num_dapm_routes = ARRAY_SIZE(wm5110_dapm_routes), + .component_driver = { + .controls = wm5110_snd_controls, + .num_controls = ARRAY_SIZE(wm5110_snd_controls), + .dapm_widgets = wm5110_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(wm5110_dapm_widgets), + .dapm_routes = wm5110_dapm_routes, + .num_dapm_routes = ARRAY_SIZE(wm5110_dapm_routes), + }, }; static struct snd_compr_ops wm5110_compr_ops = {