From patchwork Mon Aug 8 09:20:28 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9267321 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 27AC560871 for ; Mon, 8 Aug 2016 09:20:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 16AF827DCE for ; Mon, 8 Aug 2016 09:20:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0AFBD27F8F; Mon, 8 Aug 2016 09:20:48 +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 9CAE827D64 for ; Mon, 8 Aug 2016 09:20:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752343AbcHHJUg (ORCPT ); Mon, 8 Aug 2016 05:20:36 -0400 Received: from relmlor3.renesas.com ([210.160.252.173]:42232 "EHLO relmlie2.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752558AbcHHJUd (ORCPT ); Mon, 8 Aug 2016 05:20:33 -0400 Received: from unknown (HELO relmlir3.idc.renesas.com) ([10.200.68.153]) by relmlie2.idc.renesas.com with ESMTP; 08 Aug 2016 18:20:31 +0900 Received: from relmlac2.idc.renesas.com (relmlac2.idc.renesas.com [10.200.69.22]) by relmlir3.idc.renesas.com (Postfix) with ESMTP id F28B852310; Mon, 8 Aug 2016 18:20:31 +0900 (JST) Received: by relmlac2.idc.renesas.com (Postfix, from userid 0) id EA7A72806E; Mon, 8 Aug 2016 18:20:31 +0900 (JST) Received: from relmlac2.idc.renesas.com (localhost [127.0.0.1]) by relmlac2.idc.renesas.com (Postfix) with ESMTP id E500C2806D; Mon, 8 Aug 2016 18:20:31 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac2.idc.renesas.com with ESMTP id UAE15660; Mon, 8 Aug 2016 18:20:31 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'";a="217447451" Received: from mail-hk2apc01lp0207.outbound.protection.outlook.com (HELO APC01-HK2-obe.outbound.protection.outlook.com) ([65.55.88.207]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA; 08 Aug 2016 18:20:31 +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=me0O4o0Mn/3733KYtQ+c+g6HCuICTIzTmqekgO7jwnM=; b=Pv2wPW0ZTjwcOrw9/K0KvaiFDSeWfPNrU/csW5GBWLGd2IpM+OFLKOCgMeyzk5q8kOC+AUTG35ho70QFZNyavjN6ahTLuKgARdRlbmKYQdPvhsc3LkGykIb3lyxetPP9APsavmRlPaqdPGGnzGGOwCJQ/8HyYJECPXEMq04H+k8= 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:20:28 +0000 Message-ID: <87oa5339q8.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 106/159] ASoC: codec duplicated callback function goes to component on ml26124 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:20:28 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: TY1PR06CA0031.apcprd06.prod.outlook.com (10.164.91.41) To SG2PR0601MB1453.apcprd06.prod.outlook.com (10.169.106.19) X-MS-Office365-Filtering-Correlation-Id: 7411143d-f1e8-4788-d8eb-08d3bf6d3d73 X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1453; 2:6l0gvaXDPw87VpM17HBsK+ahG5hW0EsREPsUzJb/rFlBZXSa/ZMQqveCov9Pb8rsGeQzGGzfRXmhqOOekVJi+897C50PsOjoD26Mw3Z9C+IAKzXtdrQ1UYQ7Hw+7I6EwQYcKAuc9kRC+ougZQoCa5XZGiijuz22i2p8nrPzbFraxoXyPtmYqE8Jl02VNbotT; 3:UmP0vLJ2Njn+gHc5mYYQzPjABQmvK7CGyOlm2NivVGpE+v5U+xZXVzmuZ0vNrLvviAd7v8yGLvafHYhN5wb0MlpKQmHyIhT2bj/G8q3sJdfWJyV5W8HfRDSJvAz9kK+n X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SG2PR0601MB1453; X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1453; 25:34ob6YNR/urpxLSTgdJhnqpkL+SZjg+YPQ0D+r3Up1IwhhN1i+mMsb0qcFdeOvdM/E/Hfsb2r9fcD0adUyCTaWwOIo3anPBdu4CTGQ31EPJCFbPT5RGAxE7P/lmQ/Dw+m/5p5hqW/Ag6q7VPrDl9EHzyl+Mh1ORkRXQKX5xD0xxy0K3fGgGW9QsLnZ7l5X2G6uuDaLWOI5RVq3edF2kgSwRgIMtBSjgSlCEnZI1qQMYUMKQ+3/MQ4BYex5I/upj2aMECcsv1WfRBWVTaWV3wOTLxOlMr+Osg9uFpbme94Iu19GuDQC7ReHUEGQwnKaKIgo6yvKAUic5TSEc22Tz2XIZZrKR6TWqYIWpBDn+CrACkTBKVdMcmMUhZ2u1mm6KHCTOk6nOKgym3wbcZkpGzNLFPikvi+RlNYWVnFal9sy9BiRFzoBW40ctI1WmdjI3MjYyTWCmg0ByRSUlUjLbvysZsxcSkk79Q1VcbLgSz8icR/VSBwkpBI6cx00lXGp8fVx1Ml8q6niYgtuQQ7HIBerKdpIWmmjd72zIoWYx8rq1QDJ2zOcSUV1k1IqGl81HSjCee/vEBY19kriCr4LLBKfH4iWnTDISVaKVc3oxu/Tp4F8ai6nY7dcZLPvAPOWT8bzhAKeRcAeeM/lvQX74/8SxZItGch6KBuTEaEmcxfbtIhcvLZ+WqgGco2Lid0mHMTAC0WET3T7BbvtcDv1Tnbg==; 31:zbDFzdFb57Pu7PotqSaPKe3TVAgEnYAjVwOtfCI0Sy7PwXHXpu4y9FLy52mspcW86fg7i0wSo0jeTKUbVLXPet0fkeEI8OX0q1yCR44U+ZBBwO5dE6iwYT4aTSjZ7yP8X2x44OsZK7RT41GdjRAD+V5XsYuaQwWh8qG6C8M3kJzXSiJqzUdvP1ETf8QFKDjhyGKuy0eCJ6i frB4Go4+UTgiZefaAF42p27o1V3M4oTk= X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1453; 20:UCBdyOiG3M5y7Q5s+lAbo26GOQDmFZDOMdumfUGkpAHBlrTjMiH4IHys4BKbx7Cv34/Rm7VXWfpGUzPgaakv+pPkv4J7S//JRZemPI/6LU0fuWtI7BZ1hVzPr5ELDFv2u9hnw3YK8w3wrfjYUdS4OlZCLkMv3MSrTJv8AtLSs4gSncbXbznhBNRC7QAMyh2M5p4ai4XcD0VabUa1RQNOhzEdgweWsd0FbL2TTieCR2uFlyYVOW/YvF5w9nur6vy3bPi/L/Jc5UCI1WKbWu8lD5BTgDapUTxjS5ZpUQRQ+641PssLfQR1MQwpPBTi8tFcFcp0lqPHZqEZWnjv0CF9qygHjgDDf158zige1pT7e4dRdtxMfodzIJyFC77NDLvSKr1fA0geNiOjmQ3dDi/YSN/OwPvteFbQdo50cF2hdq8z+FzoZPzU9e7deGFXTVzHC+V2CjNQHZyYvo280loAyj9Ix+AtxCfiYKvB9vY0s7EWGbiHho7UumfEputv3c6k; 4:4UKuXHYzOPl4JRHVvwE3NiFflx72/LQqs1y1nrFZamBMcdRl85qvfVVFcuErAZTcWzlPEJgSCtGJBmHdYq8HZn4fzvoytpDU7IejTuOhPYOk/sDI9uIeXVfKV7aIsN+Gj71Z2vteMQ77HF7ul4RHC8QftoQvqA7SZmrHPLMolTfV3vWxWNRV+1z2VJMKtDSY9DsMYw2HqhqaJx6+f90oGA5rqrvNpfXaYL8HzHw6WQIn36tb2SBRZkbXGpb+uoCsWSlCbb7g5o8TA3+33RcDLQpQrV6ILrqELS7aOjZxBFmVjTejDcAh0SC2eS0cntAl7mWJQc1nrkgAxSHE27al80yMzHTlqbAqK3PMcC+ksaVUWtD+6FZ5CwJBRsm+OOpVI6iif2uVcLAKoQgevQlNMA== 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:CFECo7gnhjexsdgGKx4RLcglNT8y5zr8YsB2cgj?= =?us-ascii?Q?zWua2WRQW/HsZo/7nv3cBnTMKFYbeLatV7h7lIRMk0m4wnB0f/zGXNL3yOAR?= =?us-ascii?Q?smT8j9T2N/ljIz7+b7qATCpEWtETXLDmgQbydsnqlwKO5WwTTLoF3OiYc6jp?= =?us-ascii?Q?l35vtjp4c398QiJIh1UrenwfEbmNQd0Y3r7qB8nNZsW8ji9YSp+EkyZ5NTFW?= =?us-ascii?Q?g2AfsCtCUj5cTNn5FHRDh7qcv7bnrNgqJtIUOXptUSOLTONbWq5M6O/psMqP?= =?us-ascii?Q?3QDJN29Ci6+v3H78FkymhI98gCahOCGcvc4e4sC2XL8XEMKkE0hezAyaJZad?= =?us-ascii?Q?ioS5tSxoCLWwnpA/qHNNoVBuFl7JiWSqq0IGc0eFaHS8PegkTRg4vn5TiPfx?= =?us-ascii?Q?UrryA/EBKA9FTV+kFyZaJxb020LpGFbpfSsBbk3gT0K3gkiaFyQJOQ0j9Cn7?= =?us-ascii?Q?P9LzHCEHx0y4Wj760CkU4OhppsQSJn0ARu7I6+4bco4hZaSmLdyyN6j4v0xD?= =?us-ascii?Q?ZGXF01pXs7aadN6S1BJ7C8ImTYfJsexifsJbalimff3KDTKQ2kW4PlXelvmb?= =?us-ascii?Q?Rp5CopZY6bz3NFxYjswmr6ZPdTlWUb8vvw1NbElc8/6bcPg/QnXm6jVcyhmE?= =?us-ascii?Q?TTgBA5A+Sj5CKts4Lywl+S7xxVWjRW5sa2opXzADG4mgtVASNEe1YcgJZWvl?= =?us-ascii?Q?SKuoiLW9jgNnJlD41y8HpToqqvwmFpfmhXHX5DVGGfFkCcS8F+FwwtfU+xfW?= =?us-ascii?Q?LNuznZCcnNakkybd08K9/OcuXKVlcvqKSh2Xh64aLR+8ersfORr5jxnQCBmZ?= =?us-ascii?Q?fSFQ7irlWRJkpYNHd9o79N0nVZ11at3kDi+0oz1G+lNs2f33LlTMlMZbXTgM?= =?us-ascii?Q?NacZhWMzwgCJqATZ2C/V+loNIRnOMZ5k6xFLPIs7zkEqoFHRDl3Xf80W1h2u?= =?us-ascii?Q?xFtPxa2gm5VShhycj1b5fOqOjWJWSZowoOjNbwaB05x5kTJgXQDmW8Mn3W6L?= =?us-ascii?Q?4Nt4V6UXYT/Zs/8RRMZ7+f339RxZIhUMxlpOScMYyk101yOkLKG/FoIW18cZ?= =?us-ascii?Q?LoXErYcvy5+J42MEo3f5BkJslmoy+NijpNQIjQtk7YNUBsawQZyU85ofz3o4?= =?us-ascii?Q?djjkMNboVJtGIs3nDFynWzzXD/6X0y7lfmmniQ1mBAJwahR8kvLd5oA=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1453; 6:gJYFo8o2ak560//rnX5z/rHmjGhhp0K1Oh06ZqUIwY76atSJPIzCtfjesEIcFvvWYuu3vyi3/OrEoinffStkYQcdLlg14cRmP8ERvfxH4sb5MUe3rYjfOKP6gxHuWL8wIr2+h5hq7KnL2tLjfBpKwQrMG8xyQS2mVZDUXasbFpZHyQig4KS2ZgdHVcPOe2xAXszHco3/V7B4JoWiUvfX5nzQtQZWkQpa/1GqPH9t2KsNZR5UKLZB4Lrx/vdMujjh2Kd1R1wyQ9yPO+1er1IpM1xTG19Ql40WdI+WZNFpudFdMGhs5NV2H0wfLU9nTEAafwkUVQ95G9FZ4HTVydbhBw==; 5:l9Q7eg/KDluipcNx4kLfK6zHF+gSFDuAPoKU/cL546BzejpPDP66lcFZ4iB/apaHJJuVlligdqYCzH413mT5PgAfaqxBGHyyK8EJ50CZYNhztap8iniGJIY8j6KOMDh430Tjzv38AV3uja4aJChtyg==; 24:pqalGK7XbIV16kl0uO6F55tVYjm9qxZMMfH7NW1sEmzUNmoLlq4gJMkVwwKQEh0xAhJo2wcEFf0e8hx2F9ZNnVb4+TGEibdO6taMrJNY5ls=; 7:p70mtGY/4Th55fNkYKdBTQEBs0+TIjC9AJbL4NHxZ6XkmISY6MJgl/3q1Afqvd57SArPVwW8W/8hkjiuPR+p/yXfVuwFPc/rZh0VmzLpi9mSeKTXC8hm3Q3o3wVXz6Q1W0HzHHT68W/Ng9KJg+BEr85g1DO2RZKarKkM1vjQQeqBL9HDEccZJKqx5nbljDc54pfnJqwRWaiaz3j/wfGBfaKQ8alehakICE7T3RilgjKgvZv+irAxzBURNeKVjd9o SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1453; 20:FxUV2R/oEHsbeW81kez3D8YdBqsB2vyC3x82z9fSDAbGgxmxYmineHMBLiK5IcM6TcH/Vv4iG0fh/7+ryhgs7JW6UXDOVaKguBYWw/Cg7biMg67kakyLbukzfNbswrrQykfDE2/uZ5gvpEMby3+ds22ik5Cne4mmBu2tWK5ULFE= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2016 09:20:28.7160 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: SG2PR0601MB1453 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/ml26124.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/ml26124.c b/sound/soc/codecs/ml26124.c index f561c78..69e5e18 100644 --- a/sound/soc/codecs/ml26124.c +++ b/sound/soc/codecs/ml26124.c @@ -541,12 +541,14 @@ static struct snd_soc_codec_driver soc_codec_dev_ml26124 = { .probe = ml26124_probe, .set_bias_level = ml26124_set_bias_level, .suspend_bias_off = true, - .dapm_widgets = ml26124_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(ml26124_dapm_widgets), - .dapm_routes = ml26124_intercon, - .num_dapm_routes = ARRAY_SIZE(ml26124_intercon), - .controls = ml26124_snd_controls, - .num_controls = ARRAY_SIZE(ml26124_snd_controls), + .component_driver = { + .controls = ml26124_snd_controls, + .num_controls = ARRAY_SIZE(ml26124_snd_controls), + .dapm_widgets = ml26124_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(ml26124_dapm_widgets), + .dapm_routes = ml26124_intercon, + .num_dapm_routes = ARRAY_SIZE(ml26124_intercon), + }, }; static const struct regmap_config ml26124_i2c_regmap = {