From patchwork Mon Aug 8 09:23:46 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9267371 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 94D2D607D6 for ; Mon, 8 Aug 2016 09:23:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 84C5026220 for ; Mon, 8 Aug 2016 09:23:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7620C27D64; Mon, 8 Aug 2016 09:23:54 +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 E3D0C26220 for ; Mon, 8 Aug 2016 09:23:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751951AbcHHJXx (ORCPT ); Mon, 8 Aug 2016 05:23:53 -0400 Received: from relmlor3.renesas.com ([210.160.252.173]:41553 "EHLO relmlie2.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751259AbcHHJXw (ORCPT ); Mon, 8 Aug 2016 05:23:52 -0400 Received: from unknown (HELO relmlir1.idc.renesas.com) ([10.200.68.151]) by relmlie2.idc.renesas.com with ESMTP; 08 Aug 2016 18:23:51 +0900 Received: from relmlac3.idc.renesas.com (relmlac3.idc.renesas.com [10.200.69.23]) by relmlir1.idc.renesas.com (Postfix) with ESMTP id 3BA0C515D1; Mon, 8 Aug 2016 18:23:51 +0900 (JST) Received: by relmlac3.idc.renesas.com (Postfix, from userid 0) id 314C71806F; Mon, 8 Aug 2016 18:23:51 +0900 (JST) Received: from relmlac3.idc.renesas.com (localhost [127.0.0.1]) by relmlac3.idc.renesas.com (Postfix) with ESMTP id 2C1FB1800A; Mon, 8 Aug 2016 18:23:51 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac3.idc.renesas.com with ESMTP id UAB26143; Mon, 8 Aug 2016 18:23:51 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'208";a="217447755" Received: from mail-sg2apc01lp0240.outbound.protection.outlook.com (HELO APC01-SG2-obe.outbound.protection.outlook.com) ([65.55.88.240]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA; 08 Aug 2016 18:23:50 +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=HMX9pplib9CC/PC+H6OJyIcA/AWXkZLb66lHGMgxgGc=; b=MfAHlslIYEVxpCzz9NGsP/bqtrjd7KfLj0VmWjB3nBsLH8c9ZbhDy+6i2lysimm4yF8tYN4fbTulZtQnjVuWSnuNyfUn5mtvqRi2tr9BdDaJPmLUGbnpVh6Wz1kK4hrMd6UbM5CkMcvyw8XFRUykT4wZv9/Byn1Qa6RNez6aW3g= 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 KL1PR0601MB1447.apcprd06.prod.outlook.com (10.169.69.25) 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:23:46 +0000 Message-ID: <878tw739ko.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 117/159] ASoC: codec duplicated callback function goes to component on rt5677 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:23:46 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: TY1PR01CA0056.jpnprd01.prod.outlook.com (10.167.153.144) To KL1PR0601MB1447.apcprd06.prod.outlook.com (10.169.69.25) X-MS-Office365-Filtering-Correlation-Id: 1c9b90e7-87b9-4d7a-4fc1-08d3bf6db313 X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1447; 2:z2m8SdGqzGDsmikxesYGI1ZZEcY2t384hgHCswiRhxwPouLHuULAV9330qHn5Os56e5NVvmY03U4a746LeN+A3RH7U0dFkUxy38Y87R0K+p6sNqmrvCS1D+9oaqdZi/Z3abve22dV/T4R4GNY1OpWrWNYMG+jNEjnRyWei2nsHNxUaKXyUYhVTFxOpVuSGvZ; 3:GkPIMLsQaogEHpUfwk6ggtLu+iR5ELgPDbR4vFQqiTbGjsTj9YdsTt001sZJY7F+25e//CfKTyHhubLXN24EbaERQK2jTLGJ3FgR/J0PpaUaSeFWqA74SZIDj89HQSJ0; 25:Ld6mPMKSr03qy0Cbv3BnXtInUZxqwat5mdEtElrGR8tqZleYee+FVZBjIrslNfPChJEEgC92eE3MExITpGdNWSWDbcI1vfCNEsjxsId5qgQZvySjwqvWCMmmLQ4eY3j+stDvt7Oc2Zr5u2SI1JjK0a4DKAlqoXPyHmbap0T1sHVG1m8bakQ/vQbkBuoLbMiXywJqbsQlZjJcuEC2L48MlINzkSOrUjCMwTHqSgNtVG2NOF3abym4LX8ajfUeFJ21J+UvQrijew2WcDafB9hqdvsCHNyRalN2Tq0uSrL2LTKcC1bkkDrw7MpPw28Zpb36ZkOAeqt7IuT2Y93TrYJaMY/FfMzvJ3aYHPX8bTj9Gzr3noGYx40gMe2KSBSM7jeYfvnaqg8JcVx/rFpNRj7FskJSEddONj5D9t2HEJRErR0= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:KL1PR0601MB1447; X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1447; 31:GSw7lM5xSALNw54TzWo4hYVCS/7mH15csddyptA8DFVbOfvymv3IKBSAp2UWPSuic0/irSD4rYv1fCYCfIl5M7L2MhNPosoI7jpkdc73oQjk6KUPM4boirppzLSup/edkOIzbEYe2VBKc8cJ5kuXAUF8sV3zcToO/Q+sn5RmRaoxANeMPLp34Op+5p4fj196w1S+fV8voFd7xdhPm+Gtz/tc9bWm8hbgQrxbXP4NPz4=; 20:4qpE8mcCA11XpaVyytHORvRfuc6DrIJa2VdMqHk1u5IZVcGAuaeC4+aP/K/5lCipEsovjIr5PQpMtyhP1L/h1mRqUOrMQD7yWYthsa2gudabxSv4M9TSkp3RIQm1MmNHIP2N1RDPTYNiH4Yoq0+VKpzsEZ5vaI6yS49sB+jR6QkUmLytAbOLFP4ax/78hq3txDea4P7uqOKo/+FjGpv1bSPjPQFoRbkf4YZC1OY3NjFmvPRBBY87exyfGGcEZOe4ifYykwSrDDka20uOQwusfKwAVDLObZ0XIgcKEKb70kzcqxN8e+ZuSNaaVqDYE0Ka83ycHXyuZ0epwvbv7+kOMMpvaGuXjMJYTDnasqVbDWUzCR/xMD287c3y3UQBF1LGksgNMa2g/exRXZxuwRQ7ypcmeeRtDaVVLe+8hKw2WAOkCtp0bJKfBhFAbOF6xdb7CKfIpX1gSwK9vJooinAZIKQFYnR0trB1Z2qstfY7B0wkTV26Drnx4BchmsSzsi/R 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:KL1PR0601MB1447; BCL:0; PCL:0; RULEID:; SRVR:KL1PR0601MB1447; X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1447; 4:V4KgidvtFey52x+8YQMFhMnQjS7AQ7Zp9lJ2ZiqSwk5WJV5vH3KTQyxW5+YilMk76N0UOe0g/XCIrv3IANt+fFhcsyEwLTdDAEJ1p6ZpsPNjSs5fQmQmK5ru7legcis2+jMJqSCc8oII0hrKGgjgp3KvyTZ5JHzWNX+tPHn2Wr+7wni5crvNi69whap0JfSXDayXU95KFrGEoNUjIKYMzhHmmrthrUmxibIGjkmlk+HV+MXeJz+IT269FLsjcDxdcej90+EjXwTffS6FN4dMOzYWYlIV6S2K6XsybYdsWmHy451N8VQ1miL6PJvjYb5wBPRqyLN9qj2xrnJo9JinFpbzrRd6HUvuXqtEzT3dQdb8vA5+0l6Q8c8CtAOgzizzOFjEMdUKZCrgdwmlYTkkGA== X-Forefront-PRVS: 00286C0CA6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(189002)(199003)(305945005)(83506001)(229853001)(46406003)(50466002)(7736002)(4001350100001)(7846002)(106356001)(76176999)(50986999)(54356999)(66066001)(68736007)(81166006)(47776003)(81156014)(19580405001)(586003)(69596002)(101416001)(86362001)(77096005)(36756003)(189998001)(3846002)(105586002)(6116002)(110136002)(23726003)(92566002)(2950100001)(53416004)(19580395003)(2906002)(97736004)(42186005)(4326007)(33646002)(8676002)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:KL1PR0601MB1447; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; KL1PR0601MB1447; 23:sjdX9pDw3BbQbg9FsRjkVBh2sSKHmIuuIWYigOM?= =?us-ascii?Q?J9bSAYm5O946DXlryNzyiKB+IP305YtVITcVg4vN17jxDjKH/TGJ4GAxf7WQ?= =?us-ascii?Q?Rb53Gt4FKTQtFClZ2ncupMHIxSI+9SqMuRBwaBnSrpU6HdM/iCQngUW++6cd?= =?us-ascii?Q?73cQQnP+IL/yo1XKluAojANpYVQgQb/rnBeSU4tDsnlQilL06YCB5XxVUON7?= =?us-ascii?Q?LnIr3mHgGikSo3NRcahA2WfyURvXyGsgIzECm0Dv2w928G+QyrYFVAcLuNXd?= =?us-ascii?Q?+YDmToj4N8JBNIPJ6psS0CxcXRLQOE07X8/T2s1sDZOXXVVZ6XRMAJJjiGQZ?= =?us-ascii?Q?qmQSokPhb3NlN0pvtomiPYrIBAr+vcR+TAi+MI5ZCNesCgsPoAJSKNNIuWUx?= =?us-ascii?Q?l4eKcKgjlpu35Zeq+h4+WFhsmMKKK8Y8ntx5TqsxQy1MJsNSMRUHw/fFD4RG?= =?us-ascii?Q?rMPAtDQaFxkzZ8orrgPoFysbpBRRjTdkXV1wI9+eqs7hSnCpkKkn07gbQnY8?= =?us-ascii?Q?ph7VUc3DxwzG7yO4DsxQ1axzNnMJMPF8Ovd9ULmr3fxBooDOho0wOARocTuo?= =?us-ascii?Q?hVxqqeOedRu+JkNYJq7abzpUttsXc66jiabD9FJxTa1zd2KFt3BW0yj3m/cI?= =?us-ascii?Q?XenzMNLYUBcI9Im4fcA0R8qCbl6bT2XsQQQ4mCwjZ4b19tKnc358NmWxq/Tt?= =?us-ascii?Q?qwN2gVO1gf/EN1EXsMuXt/TYjCtsNodev1RzXnShd2rxc7teLD0wtpTsWYbb?= =?us-ascii?Q?X3oY6J1H+ercN4jQXBxWxtyOWmyJJKNo4EuX2Ad1gtB2LT/I2uwTrpXjb1AI?= =?us-ascii?Q?DT/nKmv/FBCkl/TYlqk0JkJ81FxMRyfS/OixHolCaMbCNK3dYtfNntph04+1?= =?us-ascii?Q?JkLkT8AiQBHSvBPvfV1pa0PQ1t0Y+R876IfHdD1GwI9h08hIll9Gc4JiRL6l?= =?us-ascii?Q?+faQA+2dgi3nEkt/jYIJRxr6TLBA83Pb82E6305iYl6HY5C47Q6cVp6vBQVf?= =?us-ascii?Q?zMvKABds+1x+CxtCze8Drj84pcdrJSvASzxZlOdmBKwb60/YE2v2oasOSRdk?= =?us-ascii?Q?r7lq0Z2nmmKmC04B/vTaI7F3cGa+HLwv5CDaejQuQmLeXLNVHZnAqPzF3Ppn?= =?us-ascii?Q?urfIdAVusWxPOpGF1yvWMzYmW5U9nPKKvlaNBBHoOkUaOzm4k75W3zw=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1447; 6:wFIcTEvM4J+Lu/t/uWpeSXvM+aaihFW9xWUOvbAdQfqeDw17FaKpk4JZOM5RvfjxWuNlRH53dtyenTfja8QlR4z1Fjbjo78YZeqmdZe+nuUv8MJWMTVd0ThIl1Qh3LQQvXIGhn5o9/rmdChe2Cx+isY6GfciVHbgFk2VSVJMt6DhYV6Ffr/2Y5YyZPrAZJaNkXycNM2Tm2RrWJOVxHEkRoXHqXKVDuE9mTUCnBNY62sn/xTTGOWF+aiHWDzV+wZJD34jcpOKLlS/cv7DkUItfs1NNI/iSneTp7Gj6SqV2rMe/TK7FyGx4Ht465PYddpNoWwUYn6HQcNXbN4AJEFViA==; 5:Hz5Rg3VJRHBZFwlQj2A2kH2HUZPi8z9oXhpUdMMpar2FgEDvMtIGbUcadgjr0LaA1txw6barR1+kj/GAeH5GqNgojKr324pH+WTEE0oB8Z2TcKZYOg76kUS3rE2xiEdoGjyHKTLRpP7YMmuPO2uwhQ==; 24:0T0QUFHyImq/AN/m/YP4amFcLvI4MdNfkRJqdraZ2kHkKmJuPk+WPpDv1oZpSr7jm12YOXw6A754KuPTe4YQG9gSfOBJtpj5ermgESqCjvA=; 7:BWM5QHg2invYbjGQwKBMF0joat0JX9NPoQdqDdEgeaxBKF+RLkePFsOzJxoMSAUvxxU9vaUbTg4kLpniL/SMPyrHfrOo990Bq+pGsawD9ej4LYYRzMNR0MNlO/BE23PHuBPlTM6IieoLrH+BPPaWuMXok4alyKCkm4WbJOGRGAn5YjEkfV13YA4hZDb/xF+JyzQYonBbH6rl1Vmj9mUCSbX4G+1SWd+tZW6AfQ9yEeMqZ0EUJpeszlwyHexFzrUb SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1447; 20:pIEhhaspc7BWdmxjGpkN9w4jcS5zef9B5imQ2ojQy7HluegI/5JhD4t+OKUKKi9Ri+bC6XU6zspXjkF9AtM3hqYWaXvp5A8YhqkTLHyr7aayRiO3i37dhsAA0qA5veK1bHkw7SpN8rRyL07TeH+B7i0X3Eqi5xL6Df5XNHezSvo= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2016 09:23:46.0124 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: KL1PR0601MB1447 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/rt5677.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/rt5677.c b/sound/soc/codecs/rt5677.c index da9483c..68268f2 100644 --- a/sound/soc/codecs/rt5677.c +++ b/sound/soc/codecs/rt5677.c @@ -4974,12 +4974,14 @@ static struct snd_soc_codec_driver soc_codec_dev_rt5677 = { .resume = rt5677_resume, .set_bias_level = rt5677_set_bias_level, .idle_bias_off = true, - .controls = rt5677_snd_controls, - .num_controls = ARRAY_SIZE(rt5677_snd_controls), - .dapm_widgets = rt5677_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(rt5677_dapm_widgets), - .dapm_routes = rt5677_dapm_routes, - .num_dapm_routes = ARRAY_SIZE(rt5677_dapm_routes), + .component_driver = { + .controls = rt5677_snd_controls, + .num_controls = ARRAY_SIZE(rt5677_snd_controls), + .dapm_widgets = rt5677_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(rt5677_dapm_widgets), + .dapm_routes = rt5677_dapm_routes, + .num_dapm_routes = ARRAY_SIZE(rt5677_dapm_routes), + }, }; static const struct regmap_config rt5677_regmap_physical = {