From patchwork Mon Aug 8 09:11: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: 9267213 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 05D2660754 for ; Mon, 8 Aug 2016 09:12:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EA4C926222 for ; Mon, 8 Aug 2016 09:12:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DF1A926E16; Mon, 8 Aug 2016 09:12:01 +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 541CB26222 for ; Mon, 8 Aug 2016 09:12:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752044AbcHHJMB (ORCPT ); Mon, 8 Aug 2016 05:12:01 -0400 Received: from relmlor2.renesas.com ([210.160.252.172]:63181 "EHLO relmlie1.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751979AbcHHJMA (ORCPT ); Mon, 8 Aug 2016 05:12:00 -0400 Received: from unknown (HELO relmlir3.idc.renesas.com) ([10.200.68.153]) by relmlie1.idc.renesas.com with ESMTP; 08 Aug 2016 18:11:58 +0900 Received: from relmlac4.idc.renesas.com (relmlac4.idc.renesas.com [10.200.69.24]) by relmlir3.idc.renesas.com (Postfix) with ESMTP id BAB9950DC5; Mon, 8 Aug 2016 18:11:58 +0900 (JST) Received: by relmlac4.idc.renesas.com (Postfix, from userid 0) id BABFC480A4; Mon, 8 Aug 2016 18:11:58 +0900 (JST) Received: from relmlac4.idc.renesas.com (localhost [127.0.0.1]) by relmlac4.idc.renesas.com (Postfix) with ESMTP id B56CA48014; Mon, 8 Aug 2016 18:11:58 +0900 (JST) Received: from relmlii1.idc.renesas.com [10.200.68.65] by relmlac4.idc.renesas.com with ESMTP id UAE10471; Mon, 8 Aug 2016 18:11:58 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'208";a="216936808" Received: from mail-pu1apc01lp0017.outbound.protection.outlook.com (HELO APC01-PU1-obe.outbound.protection.outlook.com) ([65.55.88.17]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA; 08 Aug 2016 18:11:57 +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=+xofWgAAeglki393PBuanm6uXDd43UmmMysBMM8ax+A=; b=c8i7w8rDkrYFpc89dRiEqQ7veeJ9dGsUuglFPJ1fXAmwTdxt3qOTBqhtL/G8drEkeJY21hbocgPaPbxxh4sH78DXYo+DZHi1o5/4FZtw/d+DmiZEQt9WidjTA6tTvT3JUD6KLpRUqDzDjv6KYP8379dA5JCYfkmakjAYXzqAwgg= 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 KL1PR0601MB1448.apcprd06.prod.outlook.com (10.169.69.26) 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:11:55 +0000 Message-ID: <87shuf4oot.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 078/159] ASoC: codec duplicated callback function goes to component on adau1977 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:11:55 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: OS2PR01CA0045.jpnprd01.prod.outlook.com (10.164.161.155) To KL1PR0601MB1448.apcprd06.prod.outlook.com (10.169.69.26) X-MS-Office365-Filtering-Correlation-Id: c9d21a2f-9075-443b-fed8-08d3bf6c0b5f X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1448; 2:4kr2Ge42J7bpoqKMIljHe6EO16uAaHw7jvSxn6SZ5kOQa1C/8QpwD/1qvfbbILqk8pCyKUs1ywITj5WedKDv2JXXf+S50ioHr/MyAKT9NYWR1Wg2jDAzDunlEzbRA8wqrr7FUcQFPOdnqLuv8D+rh6NKC5rsOzKcpUwer/UthqsaQElrofM6Vqn/SpH5AhNP; 3:A5KH6qfd+tZQGkvTnwenS4QLTrNrfxmt7vbbkF0Hx16fzr41QFIePI+/EPUMuqpbB5KaHbzmIV4vYtkCn++fowHzRfREeNAzZkQjO1cXg5A8nvIob9jzD8ownn4uzmLX; 25:FNJNjDaBFByymx9VMmooD1XvBsqAAcI6DJxdXDNx72hH7GnwLiU3JCVGE/bj4WLPn0mb16FipS1FavKxHmuYKzcCCR0vIoLh566+Rz1O+lb9w3ILLCUk/35/b+Ugj1bMNxIS9z4zqJDB3xxp7xkgq6q98Ve5y0IixMHTADanOJZGlqcFChfo8+rWQpAhH93c/F1BlFc8dIX7HOV22OnlITLU6AJUmLMoy0JFQw9FSU0Mlu4IMDxTANyNeuAD+18vtq2jCQ5njnA5SupMu+6MpEOMpZRezLenuAfyS2L8kYLbvgcOabBiZkgB14PWvGGlX1ROCZc3Eb39yktMLxEEiwF8NGmGijFztDfBnnxCgWJXhJXtyXkASPTaMO01tq636VAlsJ/V8618ivG6zppuPqm+BcpQBs8p+zLWf78ikkc= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:KL1PR0601MB1448; X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1448; 31:g6g1/W//0sUfitgZNP50YCCDTtpYHlUyEO+3DSBNtqLZEfWadaku+mD2t+ho+8Cme8qPplxuXzXIhgPG343jGRoSoGMdfbTcmSjweAMJT1b5t3qheWqJSvK4Q3nZUHuxgAmiHfJ1eUDkJl5LTaCl0I6hqr9bOEbt5PmY7UGEtH1ljU9S6vYMXRGquk8YJWD8EcjyzZWOin/jlxuAtdBlmyRFkaMyekPnHx+QeSJTJWc=; 20:c72iWivrf30K2n+aXIZXIe5bry6Clz2ssQLf7F5OV8w4z+Cy4Of9HjIdbFq9y1PGSxt+Mw2QoLXkwqu1P7sRV4gZBv+JKS/PU7S0TZEUDpuJOOiwv/XY3QHChydns6/2IYzymUVPY4rjQ9y8gs+zUts4YF5pZo2e3xVuqY1R2AIx9kzAKQ3oX63AzewK9lPr/X7iyfBj+S7gXqjXEY20K5sLJk70pCVi0I1nYcUZ4WUqYfX7ru7hj5AIh7XDgf2WhvwVUnRlK0L4ykTQ6K8yUiO9wzA3cmqzqs9ahNFksxWyeIe1hIE4M38XZrSjJUtd5UCmYVxRbtVVv6oiTmwUx1MtKi64QdDV3qXw13YgHqH0dNGjRRbrLn2cn65+BPmZ3DrYWQViBNVdf6qmRc0Bir+zfQapCtfHwsYiWXsWicgHbL4sgDaTQ+n9dyd9S3igkJs13Z3hm0Q71ceHz3UZRXL5HE5nFuoM1IOXFkWZIhVQ85qYsP3ttuYd6Y+dhJom 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)(3002001)(10201501046)(6055026); SRVR:KL1PR0601MB1448; BCL:0; PCL:0; RULEID:; SRVR:KL1PR0601MB1448; X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1448; 4:JjqIRV7w4HReLyC5s/CPD7yuM4ZaBDisg+RockaoQAOIOOJ68S7Cm1W0n6psxj8hCtWSGzOlclW3Bk6Mm7ZSsUoQbhb+Epe9vn7jezodC1O34LKS+pS9uEWi1g+zYpReXqJ/7ATG3yauou8BBWCj0iUlWDUJb1LwopK9YGqGutm/d/i1XINtI/4/Bp/t+H5G0cWHPh/N5XRcTaQAd7s7tUNzNDTwSLeF5xwPsRFcCujssE6VbsEMNFeI42F8RRYQOgqhC0HOpnoz/++izhEmMSmEYcU7GWlBummJngnI9Ji74OZXkdWcgI2B1+v6dRyVI3D9+e/1OoBwII3QP9S10ExU8PvPXBBr5IF8MxuNBKo9aAQMYajZ/wSUX+Bkh3L4L/2LuyRNlqj28ZQ88Ng7rg== X-Forefront-PRVS: 00286C0CA6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(189002)(199003)(229853001)(77096005)(105586002)(81166006)(8676002)(81156014)(586003)(86362001)(305945005)(19580405001)(19580395003)(7736002)(69596002)(2906002)(83506001)(7846002)(33646002)(50466002)(2950100001)(47776003)(42186005)(68736007)(101416001)(97736004)(46406003)(3846002)(189998001)(53416004)(106356001)(23726003)(92566002)(66066001)(76176999)(4001350100001)(4326007)(6116002)(110136002)(50986999)(54356999)(36756003)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:KL1PR0601MB1448; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; KL1PR0601MB1448; 23:jVZn5JJWI8pUun07cUNFEyIZqHePXSM3xDHnI0H?= =?us-ascii?Q?rbIKEVyNo2V5gu9q1ygt5ZnWvHSqOdqYasJB+CdrTpaKGb0bBtVvri5rjBaa?= =?us-ascii?Q?lBIOL1ye5jM2w4res19AFRu3KbEjD265wC131F/4G1Z4V1T6JXk23zRNjRQS?= =?us-ascii?Q?NCYx0J5K0PF5uNQNmHfM+mLs1klXgsFVsMW2209fqflZCnCVq3RIHsPJQNw+?= =?us-ascii?Q?8n8WqDi5XndWAMyMNPS9zF5oMmAdNUofZO/YrurEy0yD3WFZXg6SKg3BqyIr?= =?us-ascii?Q?2XWRnUuObnsaa93G/+wjku5U1Ohnws9/AJM9rnv6wsP7yQ2o0IDfPS+BsQzO?= =?us-ascii?Q?Nep/j5obVUpXFOEKdGFsYNIPuLps2fiSAy9843+23cJSdVNjFjbbIlYm8Yvb?= =?us-ascii?Q?47pPD0Hj/l7VQzMI8neQ9laskqT07879lfh18vBXTPMaTZOqssTpGPTBrcCw?= =?us-ascii?Q?WUm7BJxKFTB/t1N/mTmgWJcee2zCzfVufxg+YELylNrS64J+oODHC5DBOTes?= =?us-ascii?Q?zdLSSXH7HHCPnyXPV+uB4A/FDFu8Ui/ZPBBwwuBIE+QDiIv8uIf8jMvo5PnD?= =?us-ascii?Q?/pZ7neLEIbvmga5jtsbbUDeTEGqCTUOfHkhnzWP2diFtft5102XImX9GGS4e?= =?us-ascii?Q?cRmM3x7eTFH6kNJVo3/Y4gTHKba+Icv8EgH6DldfAumBipMOCoOFp46pPfZX?= =?us-ascii?Q?Lk57Kfl2Ea7kBXbT6Dyo+nArHxUi47+nl3KdTBVNc+GW2QrwbZxeZ078LRyU?= =?us-ascii?Q?MSovYuZJ1hflin3IUV9mDt30LsHgVjqBSLvUC4fg59Rm1GRxBtY1ycz5gsXJ?= =?us-ascii?Q?K1Z4JFOUukci9d1TMt/5ECRQfSDrYmyFN6T4PI+GHp/Mh/a3U6mg9Id2JSAp?= =?us-ascii?Q?5flarVGnUaTBdjwp0ulG6R54GWys4olBsM2bHH4AszXM3s3b3smJhEL06OFt?= =?us-ascii?Q?mU1XIyErgoOVdpsVUKJMv0jX/xeVRjaODXiP1UVURiVkmFkhJhPqa+GmKVTl?= =?us-ascii?Q?2qGrcCW/0ou76Q5zJLtBAg7jZrQ4LCBRRc7Qaf/Xvsw2vL9hJC3s7M09jxfh?= =?us-ascii?Q?/JzYbZZCNoXJzUjZlgyo4EdnN/HPX5wxUNb2dNVp7r1Idgaxlnu+BaM11cy2?= =?us-ascii?Q?obtfuQMYSWzAvKuYD7ePwUujTb0/HeNGztJQUVJbmJzDyGi0OMB6Gtg=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1448; 6:DZvF4nxF/dMhCZOyU8eK/K5YEFgGQ7DT9VkhlWTc47UXXz7rv4kW6Bh1bezXVneCH1WrgVVyvi1jMUFF9bEX0UjBZiep1fEEAcG5uksB7iI5jgeNezNGxbMjUJlF85B3O+QYjEpVSHGJkXRsbRnCFJ09QgoA2wtC3hTCBjL49iG++JPpjc6NvxHHrKVzUIIEnqlEV1ShwJKZ6RhGIoAFIoj8S3EV9nUXW8V5QlqZA3Kxba8BT/DzlMT3wUv7wY/fiYmRAkMRyUq1KmnjU5cFirmj3/Sr72JUCZO6zZyWwlFb06sKO1PPkBP0otbj3qZAZa/uZWlFyGXIC4U2Xe8Ekw==; 5:W3Vi7XKnfPeoPYl8rpiEQOYwQB8PK9858ZzXsHi5GrpnsJhSBwtfqoAaJMMQDA4ECvi6GuU8gR8o5wD0JIcxBiiYn0geUzTfts+c++SIT7s35ZL+5GKFYEIWkVLErqhRhAg0XvnvsVht6UiAV4VwWA==; 24:aYHjoD3soLAgcDpjRJQ3pxzhuQmbYDJ+M4aBANSkhbOFMguYwWb+NigwaJc6/KXaeLFdmjZdLgsseMj6Gj6MeMfI+RACGJECP9QRcK2/p0c=; 7:jPp4xfJElxk6pRzwlxccLrKBShw+P7UL7MDHHnFVHbogLWQF7U2TAM+LLAJ2iIfHnkNi+5Af8w968mVPLzthH9cCpdS749F9O9UpaIl+rmaE+eY9fLpddVK1fMeeJgA74kf0t1sI+/t5psSe8OkwoS5P3lHPmhL+JyrwWF9gOeKa7ostsmCKUkvQ4609Zaihqy3fw0Aj6de+7kj7/ASsiDhQQR0hvmSvqyX6oZHYY6jr94TxnI8U6Pei4IFwyRbm SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1448; 20:lz/yCBQEJm+/gEenk+pQuBzwz3BovUop7c0cpokCQ2h84JZhC4PkaXC3OMzGseogh8x+EWKo0OCuvNKhVKAIzuFwBSXDk5fAmRghPNsBxQknBzzOxvuvVE7J2KCTvyWVkAsjyfxZHdZVb5NH/FsV4ELKv97It7l75V+YWlnAnrA= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2016 09:11:55.0609 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: KL1PR0601MB1448 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/adau1977.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/adau1977.c b/sound/soc/codecs/adau1977.c index 9bdd15f..b319db6 100644 --- a/sound/soc/codecs/adau1977.c +++ b/sound/soc/codecs/adau1977.c @@ -873,12 +873,14 @@ static struct snd_soc_codec_driver adau1977_codec_driver = { .set_sysclk = adau1977_set_sysclk, .idle_bias_off = true, - .controls = adau1977_snd_controls, - .num_controls = ARRAY_SIZE(adau1977_snd_controls), - .dapm_widgets = adau1977_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(adau1977_dapm_widgets), - .dapm_routes = adau1977_dapm_routes, - .num_dapm_routes = ARRAY_SIZE(adau1977_dapm_routes), + .component_driver = { + .controls = adau1977_snd_controls, + .num_controls = ARRAY_SIZE(adau1977_snd_controls), + .dapm_widgets = adau1977_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(adau1977_dapm_widgets), + .dapm_routes = adau1977_dapm_routes, + .num_dapm_routes = ARRAY_SIZE(adau1977_dapm_routes), + }, }; static int adau1977_setup_micbias(struct adau1977 *adau1977)