From patchwork Mon Aug 8 09:22:33 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9267741 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 3028960754 for ; Mon, 8 Aug 2016 10:40:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 209A227BA5 for ; Mon, 8 Aug 2016 10:40:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1175627B81; Mon, 8 Aug 2016 10:40:27 +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 04AA927B81 for ; Mon, 8 Aug 2016 10:40:26 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id E70F4267EC0; Mon, 8 Aug 2016 12:40:24 +0200 (CEST) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id AF9F1267924; Mon, 8 Aug 2016 11:53:30 +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 AEC9B26791A; Mon, 8 Aug 2016 11:53:28 +0200 (CEST) Received: from relmlie2.idc.renesas.com (relmlor3.renesas.com [210.160.252.173]) by alsa0.perex.cz (Postfix) with ESMTP id 8D3D026651B for ; Mon, 8 Aug 2016 11:22:38 +0200 (CEST) Received: from unknown (HELO relmlir2.idc.renesas.com) ([10.200.68.152]) by relmlie2.idc.renesas.com with ESMTP; 08 Aug 2016 18:22:37 +0900 Received: from relmlac4.idc.renesas.com (relmlac4.idc.renesas.com [10.200.69.24]) by relmlir2.idc.renesas.com (Postfix) with ESMTP id 3FC364F867; Mon, 8 Aug 2016 18:22:37 +0900 (JST) Received: by relmlac4.idc.renesas.com (Postfix, from userid 0) id 3284148014; Mon, 8 Aug 2016 18:22:37 +0900 (JST) Received: from relmlac4.idc.renesas.com (localhost [127.0.0.1]) by relmlac4.idc.renesas.com (Postfix) with ESMTP id 30EB6480A5; Mon, 8 Aug 2016 18:22:37 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac4.idc.renesas.com with ESMTP id UAF14460; Mon, 8 Aug 2016 18:22:37 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'208";a="217447669" Received: from mail-pu1apc01lp0016.outbound.protection.outlook.com (HELO APC01-PU1-obe.outbound.protection.outlook.com) ([65.55.88.16]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA; 08 Aug 2016 18:22:36 +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=LL7V2ZlV20uLtvINNycse/+ZU+niyi1TOalwhr5jc3g=; b=d0Mml38vTfJrYtc2PN+xe/jCmgUT4hJnBtmKhHPuGUNKhhDXDDmG9mB2c3QacSkvSLQjVNjdVAfhliU6CE4o6cnEU9CCt2PIMuX03gFxgW3Uf2KaaArfJdOwzVSwRK69n9N8X2T8jZ9AhLVJTE8tH0d0o62r31NvhcyZJczENzo= 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 PS1PR0601MB1452.apcprd06.prod.outlook.com (10.165.210.156) 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:22:33 +0000 Message-ID: <87eg5z39mo.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:22:33 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: TYXPR0101CA0013.jpnprd01.prod.outlook.com (10.168.40.151) To PS1PR0601MB1452.apcprd06.prod.outlook.com (10.165.210.156) X-MS-Office365-Filtering-Correlation-Id: 70fd400a-5c37-4c1c-56d1-08d3bf6d87fd X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1452; 2:U8655WgtipewtyvRaLcq4BJyWiwS6zzCTQF67fkJSkDHhZspd6ZN06PuUo1/5NDg/pT7n38vL+wvZZqUIK3tkPJlF7WKhDi/6MqSjyOv2Uk902r63Fgatw316y40f9caMe2COVa8eyXkAn7Y7IFhM9gskqwya24DUNhOeulVc0NkzzooMeVf/u4GxZVmd/tW; 3:67Yf5G7dwacyzH9TfaAYMTAg0l21AjH/nMkFRAZvfKW8YSmX1g9bN+O5/vtnsH8yU/3VZO4QhNCGP1QrA8jOA+up8Rvrt0mQ+qN2gS8jLGAdbKD+fTUwZJgfa/3545w6; 25:t5Y2QWDW/wRd9iyOM8LMGAsA1Sp1FuYjH6ldFlL/E7t+12y/JdwhU/RlGeYf8URIGahyLUgVCWQc5vi7VuWbJQ8vON5JEqbSDqR4Wt+CpBpEgvY+so6TsQnEyMqa8ioCsSc7PhlAVji1Z9owGyn9SgoJL1wZeqq/Fy8jeyMxXxIL1wuEk5dTOEqTRGnipE+GqPEtfQnxu/ksidlxedfU1iz2jR+zVCIWyVYVVaQw6jqpNg9mGSwrU8DqOkNhL4zKr7CMpVIQng+qivEwlgtV2UHIn15n7zTY/dH3Pt/9FTLPuncieF5gqkftJM5MqSIkDtOsCzeha9ibqUeKhEqN6tAE3gklgppwf2qbd2NTJjbMjcvLiCok94xTsLhAZwKuxdMuwhVSoO7hZEtzcVB8wjxTEHfWkeoOBGQUHTAehD8= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:PS1PR0601MB1452; X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1452; 31:seL5CA+vl3cPVVuhZpwZby/CtYAP1B6bETTJ17I2ehvxIi0lD+7vcs2RLyRZN+g6vgYkwNRX/Yjr+YjbXWEQJ2cqlj6u1F9tLR8yXsgjdTZxidCI1u6NVQUieJx9SubVzGLYTEOa0N6hN9mFjTdWLB4o1cYOPrYzWfyKVLe/9avJGbef3W8IqkSYOOks3EUYsi58fSwqJxBmfVX/nhomQcMEOveHhhb6jVAlWCVmp0U=; 20:U0IM+ZyFbN9t3Y9fRYrW1OVTdE0VCvHQkFs1uL1vJda0oH/P+eb2HBUVkI8W+2+N7mVUuDDdgK9ogK6usXYrn+S526a16Y0NudUl81fHpbx4ihm24WYU4rmTL+AoSeo0+jGmRHX7gedZcpcq5Nz/DTuOdGliTfaGUzLdcuuMQ1G0mRPy+rdwBZF8H5iQKuwS29bj5tppNOzjkv9ySjnP5Ob3zRkvM0X7S9Ai53Jo2fDu50zDylfwTjk6hQrqW//8ghoMYn7gJs/ZgGhNXrMi+V5cERE7/umdLVj/c4l/trKKpahkN5FVBr3opyVnFt55keP4m2SbfXYS2I2YjKdTS+ppZau2CB6nPQPCBmZTs4OGz1L6xJ3tdchax1neL74CID2GAqWLW9tWxbXFXzpwlbWsnmt8KtU3Ownik4Z6HMMhjdVfQckmOED5MJF+8tCffWHpBsQ5sPBwmNBCFXH3uhjO3b0TF4C7iYc7bOWeQYafmNSTVOZqdCQNRsYQV2rc 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:PS1PR0601MB1452; BCL:0; PCL:0; RULEID:; SRVR:PS1PR0601MB1452; X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1452; 4:pXxzsV/4J14MUYoIMvPpMjcZeEpgK+a3ghHZYLu3USoCfQONCXwkroc/5ApJ3YQcDFN4J4RjKdxEdKiYgrInqmHwBoyX0SqiHDYyV6pHV0DeDIVgZphQl2OAR8Vsntajf6ZHCUaj/NG8knw6SJfKTqWARoisVkz149XMzga543IeMwfPE4u4oCcsStL6P69fwAYDt4hjyOdtt0ACUpLZeGSf0GWQw13bJ+joCFopija6Qw23dqEYN55cYjN5BJINRuPrIJF9S+XVTJrPwSZzn3I3A2goXEl8H7IZlAx7ffmxY1frUx2wDaS0ARRr5P+j/5l3bU4amG5PJIqGRWP6R4uFjTYqAP7uJDzecKM2PmF/87ZnPnSF+O5B+fQxssznMSeypxcnC84hZPYJiIWcAA== X-Forefront-PRVS: 00286C0CA6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(199003)(189002)(33646002)(4001350100001)(42186005)(36756003)(105586002)(83506001)(19580395003)(19580405001)(77096005)(97736004)(110136002)(229853001)(69596002)(189998001)(106356001)(66066001)(47776003)(53416004)(50466002)(4326007)(46406003)(76176999)(23726003)(3846002)(54356999)(50986999)(6116002)(86362001)(586003)(7846002)(7736002)(2950100001)(81166006)(81156014)(68736007)(8676002)(2906002)(92566002)(305945005)(101416001)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:PS1PR0601MB1452; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; PS1PR0601MB1452; 23:ohomBomBF8U5X6nhBefRq80ZHI33gApcpczhzMY?= =?us-ascii?Q?yOGmB4bUWCkQo44BApdGOTyM/oZTLhMX6A+GFBj6/Iwgjs7wYz307VF0tXaB?= =?us-ascii?Q?gOWgdQQdMXeUfFjnB3G4RNVGR7pm1gvX//Ag8QBNajRbXk0+Gc8b3knujPrp?= =?us-ascii?Q?4sF/uWevKUF7nrOvIqaLboZnMqFW1dEJtmn4iPEvNPJWPRBhPrbaoP7SQEQ4?= =?us-ascii?Q?mfs9kIAME0jNI0TBzmNvMAKVsdnsl3TD3XTSrGrAbIDxBc39XdiT8O/bxshy?= =?us-ascii?Q?eCytOrLi+6kp+5h0svcXMhfadXjxHLRYln5foidjq9Pu4jzdkhDTwbNH8qEo?= =?us-ascii?Q?4YbE7HtLoUfPe6k3n068X8ADb54TU04RexOWIZbrns9RNB0EF1A6eHdD5DQv?= =?us-ascii?Q?Veb8rqFP6t5Dz9K3wDBDEFA+XHr4wfUs+7Qn12FN0QGNJ8+xrjSQSYajPrhe?= =?us-ascii?Q?gbDVF6VSQoCRuEZ6Hz4en4vjF6/WYPWKzNx5+0ULBRQd4k4+h3XbjmGmA38a?= =?us-ascii?Q?cPC7lLchGvJv4lmA44qRWYL8BwFAP65iHCPyqfmqE8dOEzcl1Z1ylMI8c1V9?= =?us-ascii?Q?SoM4piDiFYexJIzeiA0ewkvE0cvO14b1RsMZJH2R/NimmNWWRAwr64LPkimc?= =?us-ascii?Q?zzOjmfJ2iKswrJI6oTYavarAgswjKiRe9c8GnNhABJNpLBFnhWXybFJnUxN3?= =?us-ascii?Q?SL6UjOT3daTxCWX+OmO73sG6SuwXNkjgwFkpCpOMhAncqyX2kOrz1u7ygF0V?= =?us-ascii?Q?s2D4oczfjd47luF3ACvz9rS5hOYbeaqfGlNsh57ZbrpTbHBPeQOShjGr9tyM?= =?us-ascii?Q?naUTzS1RGUqngPP9ikIHtNCxUsYKwl5eyhCI0cTMBpbFnOGRNfepsebzE2Pm?= =?us-ascii?Q?Oj1A0JObrw7W9NZf12Z7TGv9Oji5AO0KAJmzgpKoChctq6g80jDkqw5jzRLD?= =?us-ascii?Q?S+W2hOnl2gir+cKr1eJOhnsDmhSdmqFsP3d7U4KUVkQxWjzi69wH3aZJV90p?= =?us-ascii?Q?wHi/yKQ9JNlDcTf5qktk39PgqukITZ2jidW/zdEc+yokdOhr7V3Oi8KwdpGl?= =?us-ascii?Q?LOWNEVo3bN/5Fskm6dKvjacW7hfxgPrvoOJSRtEx6qceeXbvpjWajGyIvLsR?= =?us-ascii?Q?0WbFgnidWInhEbKE70yQJW1qoBrAnlL/tYqoJYyJTAGWoC/Ohr7VlIQ=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1452; 6:ah73NGHfA2S6hJlHt/6o59S3cTLoI/hCDHmtd/1w8NGemav7hK7IMQ+1d6+MxruXcwkg+HRzVbBeK3zg2ZrZPd85JtCZyJQYbxNVwR8H4lcXnh+VS2AtHhbRj9Y9j/7rY46o4rpZWqdDKyrNpU97P98Ipy6ruucrFidb2V/dQ/A4SrJxmw4dJJjLlhse2+xW120eSePuFG5r+KSFT/r1/7X157+RsVcwJXQ2/UK0nfKtdeA3ZRbgp4gZJGHcgdmekeizraIYCRoVeXJ6j2Yc+1s2t8dskusl5xF+oxt3Ywzs0oan2vvF0+liT4xA04lbQfCFkOTfu/6tGRyKLBmHRA==; 5:/h43Y7VxNLmJ41/zZFjGd56V9I9zyjbbPY7jetvTYAcvIK2j409XMB203PC44KL9EZK3oKDUv4ALTNmayGbsRNiRR2lg8Q1ByWQ7QvdkTzShfjMkl4HNwg3Nft5uPNBhmNzQiaiXVW0qJsQ/TU9yOA==; 24:E762iDTjbD22T7ALo2qFakdVnT8XsdDQy2pC+ugGEcNCEhwzNTMvtECA+2hRbGovqlazUBMUfKCmxRfcuZZ6DV6iYGABKJ0md1QKXjdJrK8=; 7:V1COSWm7lSCG/r/Mrc1aiqWHcrGrAP3KkWUL0tQ6BE56wHnmaCS/sOclRIEqWkPOFqswpS+3UMVktr2gd+spE6LD/MyEfR+SW1owDRjPg0GM7YBEvUxXPOokmJpaT1FTijtE4fN6/Byd7RU3VGTpuxB2Q8X4/A1GFGH+Plr4lPAUROGfKCnWjS8LSSndl52yBsYu/95JkblPFnwFyHuVNhm8x+EQLkiSJ5M795YFqcBGTrnKjW4/GpHe79onzch5 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1452; 20:92rP3cbchvLpwgKpOl9I2uqp/moL+sPRiBypU8/NiMM0lWEuOSc+liLdztZFNZoWqagiEU+5hYIpesSeurfDAUyh/PWSHX4DO2fqpK4QSo6L2HN9qQAdJmFf/TWz0BMNorY4NDiaYvT/6QW+e0UNDBkKlt+XwuYVBllwWbplVwU= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2016 09:22:33.9636 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: PS1PR0601MB1452 Cc: linux-renesas-soc@vger.kernel.org, Linux-ALSA , Simon , Liam Girdwood Subject: [alsa-devel] [PATCH 113/159] ASoC: codec duplicated callback function goes to component on rt5645 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/rt5645.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c index 490bfe6..10c2a56 100644 --- a/sound/soc/codecs/rt5645.c +++ b/sound/soc/codecs/rt5645.c @@ -3484,12 +3484,14 @@ static struct snd_soc_codec_driver soc_codec_dev_rt5645 = { .resume = rt5645_resume, .set_bias_level = rt5645_set_bias_level, .idle_bias_off = true, - .controls = rt5645_snd_controls, - .num_controls = ARRAY_SIZE(rt5645_snd_controls), - .dapm_widgets = rt5645_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(rt5645_dapm_widgets), - .dapm_routes = rt5645_dapm_routes, - .num_dapm_routes = ARRAY_SIZE(rt5645_dapm_routes), + .component_driver = { + .controls = rt5645_snd_controls, + .num_controls = ARRAY_SIZE(rt5645_snd_controls), + .dapm_widgets = rt5645_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(rt5645_dapm_widgets), + .dapm_routes = rt5645_dapm_routes, + .num_dapm_routes = ARRAY_SIZE(rt5645_dapm_routes), + }, }; static const struct regmap_config rt5645_regmap = {