From patchwork Mon Aug 8 09:12:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9267217 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 6C3CB60754 for ; Mon, 8 Aug 2016 09:12:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5C34E26222 for ; Mon, 8 Aug 2016 09:12:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4F18B26E16; Mon, 8 Aug 2016 09:12:18 +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 BC24426222 for ; Mon, 8 Aug 2016 09:12:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751979AbcHHJMR (ORCPT ); Mon, 8 Aug 2016 05:12:17 -0400 Received: from relmlor3.renesas.com ([210.160.252.173]:61346 "EHLO relmlie2.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751280AbcHHJMQ (ORCPT ); Mon, 8 Aug 2016 05:12:16 -0400 Received: from unknown (HELO relmlir1.idc.renesas.com) ([10.200.68.151]) by relmlie2.idc.renesas.com with ESMTP; 08 Aug 2016 18:12:15 +0900 Received: from relmlac4.idc.renesas.com (relmlac4.idc.renesas.com [10.200.69.24]) by relmlir1.idc.renesas.com (Postfix) with ESMTP id 3515952E6E; Mon, 8 Aug 2016 18:12:15 +0900 (JST) Received: by relmlac4.idc.renesas.com (Postfix, from userid 0) id 275F8480A4; Mon, 8 Aug 2016 18:12:15 +0900 (JST) Received: from relmlac4.idc.renesas.com (localhost [127.0.0.1]) by relmlac4.idc.renesas.com (Postfix) with ESMTP id 0EE4B48014; Mon, 8 Aug 2016 18:12:15 +0900 (JST) Received: from relmlii1.idc.renesas.com [10.200.68.65] by relmlac4.idc.renesas.com with ESMTP id UAN10527; Mon, 8 Aug 2016 18:12:14 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'";a="216936831" Received: from mail-pu1apc01lp0022.outbound.protection.outlook.com (HELO APC01-PU1-obe.outbound.protection.outlook.com) ([65.55.88.22]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA; 08 Aug 2016 18:12:14 +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=G1aEIcAkD7gAWdjLpTUest4Y8tNdKXJ64IpHt6gvdk0=; b=Khw+Ks/uuojI3SkOnIeI7uNwc7VizL++pdATBRbgthtqRboNq0kwbwrDU8+redomBrWeLy/GUCfy5z/WNIZ7nHjHt9RzCKXfacTxDvaV+eRE37k7b6SehiG3In7uoC2j2Bfbvhx/YGKHeOHxdX5q5bkNA7NQTKd98UD4iAZFbYo= 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 HK2PR0601MB1443.apcprd06.prod.outlook.com (10.165.182.149) 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:11 +0000 Message-ID: <87r39z4oob.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 079/159] ASoC: codec duplicated callback function goes to component on adav80x 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:11 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: OS2PR01CA0018.jpnprd01.prod.outlook.com (10.161.74.156) To HK2PR0601MB1443.apcprd06.prod.outlook.com (10.165.182.149) X-MS-Office365-Filtering-Correlation-Id: 18a92004-cadb-4b0a-228a-08d3bf6c1502 X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1443; 2:hoW2zEY1c1M91kkhYB/vCDYLkY5SpADTgWnn8RqbmNq6LoPIb5FU7w3U/OOkEbTWi/D1IjdmpAhdOB9RkQd05DX3szDnC27oipHbu2Xjzt0vPl12C/nAaQ1+Wd9Fgm7B+yUZRFev7MHU5kNPx4pXy0pdyuuVED7vaZy0XUhyHaCbWqifNJ+8SJ/oS6Xazbnd; 3:/yfkFEs2WMs0aeokZbIpsHMcYAu328k6Gko3uM6+6owJY+I21Z7pedFPcIba3KQvFL5Yjgu3pfzB1ZXQzWhsqCC/codiYv589C5V+LUx+A/NyGdWUf++6/prGngEXQnY X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:HK2PR0601MB1443; X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1443; 25:XeTVeCeaMAEqzSleierqkyQHFEFLBrcjnYUnU/lwQ/ZNY7fg78IuL9cWdSPYjj8Et7Uy+G5Qp8fJxJW06SQzle9q9Idrnp9+djGxwb2bgedYTGWndk6bn2Qr6qBncvvs33uwpvD1iJ76hYwF5km+3+jnQFE7UagobzrGqG5NM63nJCP9ohGvUiHdfNriEJlceRWny51ZwRFSUyXqqtOCPQPHvmcUJtFDyMrJURpjHmWSjpvWjXpkmWBwl38CvA5eoA6zcsuRfP3nZQpeHG91ioxPon8H3o3HMO4yCM6B6b3a8nKibW7rjuRNBknrAMTe20/YAR6P9It7y9D57xM+gj5DySEL6XcLVBEEycdJ8Jf6WDsyyal2u4hu1X7luk/SdCUIjswbb70P70Q7UbfLbzPuHZfA1IynLlkkksrOg440Vue4gGLHIEIsIJ3EJpli77q2Jbd10lzXKt5hnVh9ntUkH4GiXsP2zR/EywIcY2z0wKr9mCyP3aPQ81G4U2fyRPbb9PYBdvcQOUAsu3oAuP31CjBxM43Yl/OxAH5pP+i3zPD2Kb1m36w2gdqmUgcO+mZ+e69jJBqDCd3ZOsSKZquqwfpWw3i6If64BptpuprvOIzPhqNTwJeQur89vJ0rj3DOqnI/+Mwrd5TxWaTlWrDzhNp5ddC4/dO+R0mwzjFEpN4IzF7EzpArf8Z+LaBH; 31:u1y7vEypTlneL8J090aJ5/nknZ1u9wtzbgIrWaNITopzAQ5bBeoiCkikfIy2F8FZ3Bp/4IxdeExQ7G0C0M8e1sj09YOy9I3Ugmh2sLb6/0xokwxCjp+5O7sf5lNIGVlEye+BomRi8SGmafCUNlXk5xOzSC7Cf2I4igJmv2S+5vTe9wZjsHtCVy8gPsA9IGvbNbI5WC6qChij8SuDABVDwIHydEXG7sOPQxo TFinSjLM= X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1443; 20:ZNwjvQQtVhkCNDG2vjwwhf0v+qGmtLdWe/NNTHEjgt+qdY98d8pojM79Mr9EsJ7KU1vmEnaxMvgYJyibHZBKVfAKxkLZr82rkr3DNMO2EBpK5z01W45vaeMYcLSR7NcQSyWXJ+nQiKXHLZoMBM9zRr5mDHy7tvmJ7N4HxGDJzZ18Noyd0GVkzuG1fhOJEz19XGXH0ogiSH3TqHgDcTp1hO69n1AWUBjtvSy3Duov7DpMy9nc2Fjv/Z2gS2a2LS6agRLxGLRFFiG3TC3IDlMcxjJRYzTxHq6OJwTcFz3himDls1hKgnX4/NBETNlf8vqriGcXQjemdexCekXSAuqk6MwkA/++42VC+WCCR/mldA5XCZJeZS+LQWQS+mLwyP9bZxu5WW6IKp4/cI7BEX2usA8RstiJCQANamVkODYzOIuyCOGblZE1rJkM7CgmWEb39aL59m2OXe3VGPWoN1UpAcMGEoyQzFy0T7CDgUbFIhHMjkbRfeQmcNks5nXXSMAw; 4:66xaEejXI54ZhPgdCKettfrMl/wCwQ3UuU8LmD/9PFYwB2RiB5oS+qGbdoV82xUFyKlod3ZH7H8xhobg97NWPXmv/R9mGNkMyf1Tq26WsFgeHaomZzam6bAOJ6v2RlXsRe6tBvJUAkLMiUh+b1u8a9R4SN+fItkHwlkExoZ6QiFep2lPwIOWoCtWeoSkXRjmViIL94aleV8omeHOIxgr3auPrHxTvVUV3Q5j/4iROXtuJSC5I2Gvho4YG54PTGhkrLUaasWqGrvuhaHW/osI4FFBy0PQGAwf6B4lvLuHw3U/RjX61PX/UhU0R+HOfFF5eqFJlv9dA7hJSoTsgKC2k7hwGQ32aQlelkTrVX0E05Sf14l0ttQ8HSvRmjWa844BA5ELwapsTabIuqcnTjm6jw== 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:HK2PR0601MB1443; BCL:0; PCL:0; RULEID:; SRVR:HK2PR0601MB1443; X-Forefront-PRVS: 00286C0CA6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(199003)(189002)(2950100001)(105586002)(101416001)(81166006)(81156014)(69596002)(229853001)(77096005)(106356001)(3846002)(19580395003)(6116002)(19580405001)(36756003)(68736007)(586003)(42186005)(76176999)(86362001)(92566002)(33646002)(23726003)(8676002)(4326007)(2906002)(4001350100001)(50466002)(7846002)(83506001)(7736002)(305945005)(189998001)(54356999)(47776003)(46406003)(97736004)(66066001)(50986999)(53416004)(110136002)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:HK2PR0601MB1443; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; HK2PR0601MB1443; 23:nO676OPWE/GqjK/Ak3l131E+jgADDat2Hb47mRP?= =?us-ascii?Q?S2LAT7evk77Hbpa/ru6iBWUDMGbgE11iiw0bgumMqWrpfRGXEbRoc9sy56v7?= =?us-ascii?Q?msazyqkeqyQW0fBtXnZHN3UJ91/P4LNP0Jpmz8syfw7cJCkDLlQ1tC7gU78d?= =?us-ascii?Q?22MjzF85hDvG6sGuXBkex2lsUOxmZt88W8LDeOv/9/CbMUj70obW+M9zZghT?= =?us-ascii?Q?0hxCazeXwUbqFuyUBX8y3NHwGwf2FqExshNQnsMaZ8KoC1Pkii7c4jtsLV7c?= =?us-ascii?Q?2ZFRIL139PxLAdHRbxrkef3X+hp9vfYMrxPgs/Jg4w0WRot3y1awwkgeH8n6?= =?us-ascii?Q?9FxgYHxXILWndUtgahokRCfpVPS8PxC2rPyskFspeX90JkbfNmQW3lrADzcx?= =?us-ascii?Q?h2WuSFotBCqezfybRqMgyg7y2GnfO3kPUHyeGWSpWUzIIlRNoDOxGHgm5jv3?= =?us-ascii?Q?JuqIq4yPz4IghVg/EgksmGYMndMaosi+QgJXFlXXZZ0scl+Vr8BEGhsL9rfS?= =?us-ascii?Q?qc0Pm3Irf6ICEgTIl+FbgCoobmr3RP8wU1+tmusEzwfgoBaxQHUTj6+MD5Fo?= =?us-ascii?Q?qbWeOBBdDHdTrOkCYVSNEx8oj+0KVv8Vpx0Cxx6wGZnTkI7khqZhhedL0col?= =?us-ascii?Q?ju4CeIAdjA8DcS9xHlZljL2FUL6YyGH288+PwCFxfaDlHuBeLRMMSKXTbBCn?= =?us-ascii?Q?zOQFguSdqf7CCmQWA3ifCKk/couKGLyJ5ef0qCbm8iV7elrIT5AZ52CtOvkl?= =?us-ascii?Q?/y7520VPGKlT4XYd3nML7rPlWv362dLRgbkT6fHe15hy3RYQI26ALGHwhMnM?= =?us-ascii?Q?ORefNArnWhQPVZvwFqLXBrf/Wi7I0zBSCmezCjRsJmoByXebXah+j4jky9i2?= =?us-ascii?Q?yHARLSqUoX3AzSccaBPhYFcxP4GTIhk6wvkt64ZIu0HAr8SgrdHfLgSvlx/g?= =?us-ascii?Q?YIMjPNgvm+Mr2yWG4thD8aAdcS6DTcg6b4P+qLgEHNsKq5ZkrIKaumnaAaYZ?= =?us-ascii?Q?iaqogjuOGE35f+nUnttGfr56KGLU4VbyIaBfpQpmh/fyDpD3q5nrAIWiyc2d?= =?us-ascii?Q?HHu+a4TnmUFtpLD2Tr5wI7WCy/FBf/NLTui5127kX+6TUdezwJNP1jTTW9GO?= =?us-ascii?Q?5ZFDcFxf+D2OJnlV7Gr63CpKetqO2iyiOV1TnViU7aIdVyb2gsV39Jw=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1443; 6:B49z9vHCSb3fYMjhK0H7+2HZ//K2SmBpjYP3NHRoVP0qQgDgqY0kH9W0l3RFOmSHMqYzbrsiZyCF8T+f7aGMNUZQLGhvhtmjl7u662JJvwuxdEsodClL6Wi3lykyP/RJnfpt1Fq0OKTZvKu9s/aFn61WpTSO8WG68U1c5+I3gFRMY+sKeqAa+9sDw6LZtrKPenGan0xhbzALdKQdaeuM144zsp2tnTgVYNcooT19+1gZQtxo1Z8l1XpFqNSxW4ChfHAc+VXFluE25hQc8O1g+pe3XG1+DH3XqTAANY/hKcZAKGQeKaCT5wSQzvrmM+xwCPA//ya+B2xPzM8CN2wxmQ==; 5:rPAdH1uLWyRluXP7TYNxkTER546yLMCpFXaevT7QB19oEgqgvELTUWGkxKOz29eoTbdz+dWHL9GwcizzkzbrUkYG19iHOe+WuXrgS0McCXP8VG7vyQEHJ2onfOcZ1Ko0IupGarOR30IP7PgQFShe0Q==; 24:NtU4FQVMr9aa4fceGO63eQws7+fbuWrejQMOM3sEFO5HF/74VOVoR9Di/UAZuORwMahYNtelA2EDKGQ+pdAUZ8Wvd3t5M5Nd6BGO+JyChyY=; 7:qRvEmPLiORTavtfKUBn3kGqsv+KUSU7dg4S89B2MXCufkuv1ECW5/jkg7V1BWLq1hWFZ8jHzwKDRJk6qG4k2DN2RIH9bpy3XqQSgs5c19L+HWEFDc+UVCYlIP/BGrAKz4qZVL8uRAIJTSiiNJ/UMqgY7EnggbtSRCxsRHHGjo+WhJCAPo/2vOkWxwtjVxKWHnenCy+19bmKyGR4KOrsKOjdEAb1MHj0yCinx3w2nXy4bZhzcTMA6QiapRnUAcaCr SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1443; 20:9wTnmt1U/EpzBnwRyclU1cXOZfM17qztiCZNZb2vhzA828judbcKXKBat/huKyX/2N1t+G3J1s/Jty+CESrINSkZnFhnEmSDmGTYHoKq5f+NuSWjD0bL+ElNWx3gKhatCPbe/GQNPNBP9T9/1i3AgZRs62wX/Azj24S/AJ/x7K0= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2016 09:12:11.3932 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: HK2PR0601MB1443 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/adav80x.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/adav80x.c b/sound/soc/codecs/adav80x.c index acff8d6..6e793eb 100644 --- a/sound/soc/codecs/adav80x.c +++ b/sound/soc/codecs/adav80x.c @@ -834,12 +834,14 @@ static struct snd_soc_codec_driver adav80x_codec_driver = { .set_pll = adav80x_set_pll, .set_sysclk = adav80x_set_sysclk, - .controls = adav80x_controls, - .num_controls = ARRAY_SIZE(adav80x_controls), - .dapm_widgets = adav80x_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(adav80x_dapm_widgets), - .dapm_routes = adav80x_dapm_routes, - .num_dapm_routes = ARRAY_SIZE(adav80x_dapm_routes), + .component_driver = { + .controls = adav80x_controls, + .num_controls = ARRAY_SIZE(adav80x_controls), + .dapm_widgets = adav80x_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(adav80x_dapm_widgets), + .dapm_routes = adav80x_dapm_routes, + .num_dapm_routes = ARRAY_SIZE(adav80x_dapm_routes), + }, }; int adav80x_bus_probe(struct device *dev, struct regmap *regmap)