From patchwork Mon Aug 8 09:30:13 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9268079 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 63A0E6075A for ; Mon, 8 Aug 2016 11:12:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5312B27D5D for ; Mon, 8 Aug 2016 11:12:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4826F27DCE; Mon, 8 Aug 2016 11:12:35 +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 51B8627D5D for ; Mon, 8 Aug 2016 11:12:34 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 78F0E268971; Mon, 8 Aug 2016 13:12:33 +0200 (CEST) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 9D3FC2670FD; Mon, 8 Aug 2016 12:05:48 +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 F1B482670FD; Mon, 8 Aug 2016 12:05:47 +0200 (CEST) Received: from relmlie4.idc.renesas.com (relmlor1.renesas.com [210.160.252.171]) by alsa0.perex.cz (Postfix) with ESMTP id 5F37226714A for ; Mon, 8 Aug 2016 11:30:19 +0200 (CEST) Received: from unknown (HELO relmlir2.idc.renesas.com) ([10.200.68.152]) by relmlie4.idc.renesas.com with ESMTP; 08 Aug 2016 18:30:18 +0900 Received: from relmlac2.idc.renesas.com (relmlac2.idc.renesas.com [10.200.69.22]) by relmlir2.idc.renesas.com (Postfix) with ESMTP id 06B554FCBD; Mon, 8 Aug 2016 18:30:18 +0900 (JST) Received: by relmlac2.idc.renesas.com (Postfix, from userid 0) id EC6252806E; Mon, 8 Aug 2016 18:30:17 +0900 (JST) Received: from relmlac2.idc.renesas.com (localhost [127.0.0.1]) by relmlac2.idc.renesas.com (Postfix) with ESMTP id DDC7E2806D; Mon, 8 Aug 2016 18:30:17 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac2.idc.renesas.com with ESMTP id UAD20380; Mon, 8 Aug 2016 18:30:17 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'";a="217448225" Received: from mail-sg2apc01lp0246.outbound.protection.outlook.com (HELO APC01-SG2-obe.outbound.protection.outlook.com) ([65.55.88.246]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA; 08 Aug 2016 18:30:16 +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=zi0YDxjD/sYjq5VXIEj0ybUsNE5ZCsBHNu0hdMVJgkU=; b=QnDlX74KZVToycFUYq5Sv5yJOKmTuDUYDFGSeG8FsN7EMEXF5BFUoYak0OI347rftdhYvdgTnEFRm8v9G29jtjSOwPn9V0POQgtQfNYkH9NfTEdmQ/CCw1A7RDi3fCYm03opATrJJyWJZEcEAndPLpprumQbazPk01yQl9dZYSc= 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 PS1PR0601MB1451.apcprd06.prod.outlook.com (10.165.210.155) 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:30:13 +0000 Message-ID: <87eg5z1upe.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:30:13 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: TY1PR01CA0125.jpnprd01.prod.outlook.com (10.167.154.43) To PS1PR0601MB1451.apcprd06.prod.outlook.com (10.165.210.155) X-MS-Office365-Filtering-Correlation-Id: 02f21c98-9975-4cf7-9729-08d3bf6e9a00 X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1451; 2:j0z9PdfyNFiy/xg3W6WsAwczy26VmJ11iCteIQZ7jq2fBC+KTe85WRrRjW1M7cOVPAo53lGGVVnUqCaT2KcEqWYh8IENtnG5pyiTIBURzACtGHWs4u1gHgQKidACSe3WmEeFmqvL+awk4tsqsu6kLhTqJSpBoBc0oflXmyGFK/0ntxJzA3uSfdg4M1/RxIAs; 3:jwBECLusnh0KGxvu+m4D3Ds78YyupLzGroIHTE/q3x04vqFYD9jT585zd9K8WLUMxH5/9vmw5iftF/4jI14MMybglJj0mMe5IfrUSvpzTDZFB6mORp+DHhiPe1DFTDzR X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:PS1PR0601MB1451; X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1451; 25:Hlx8gvwxo2c61Q7JhKI5p3udUgMR6WozAAmLjD7H5imdtxxgXW8bzPeJ8peoglWgKl1JfxtxLPSQWzF5+uQqs7GsNBaSUv3qaeyLfFTvfxP3uiUfmDoS5/R+yV/y3pQ06dqLiMy+hcjrreT9KJHR2BC7YzGzuRXpDeSZlLgSjuBwdV6pBeot3lKFE+dSpqW7yikvd0gQx+Bwh8kMFDtutS6lTyOGJfgIppvDeugk8yr0MPgxyUP8iYJInlyVyDLnA2NdpLHUVCk3kjJF6GEeqBVqE9X9It7CRTwe+RcL90TeWv1bRr+WmfPnk5p+v1LTtPZuUjn5A/LsfjhmRaXj7p4YLv3Z436faESUDM2RxF9M0nA5dhNZwDNI1O4QUSWZWXxxbrnCthi/gnBAomr9ZbMG95tkcg/iSsrMaQbGk1EnQe6Om/sGbVw3oVQ6g8LSdK5UQqVCaiSbEJzIRBTgCm/f/Svl1OwpEHY3WtqTAMMI1uksJ/olnC5QXPV7VXXSVnPqnyPEUUacchTglqeAH8rWNYQkskzIWyUVD6uzr+egZLHOapx9ckUiDdTzGUTgvmZYx4hsch2Zu9V9x8yjrHliRyhdAwuZ1uJ/aGg7k2RcqWbY0pZAdb6DkaUz0Qmgts/4e19fqJvor/QclEXfOK4fSvYc5sC6Rjo74bOcflaQTfyx1qF0/T//JmCsC1AOJNKwHxkEEs7hY+rvV7dhXg==; 31:lN9JpF5zG7MSgRsXEudvWtE0bAAU/64UMffwvO1ZL/9AtQxfxCDVonPnvL0fNl16C+kK23nryW+RJ2mTRpr/Das5cuo7cjq6FCWG5j/YrHWCntLUK0nTJ1SZn7Otz838E3ybb5hy9BTgA51mRY32zyPSLpOEg4wca/GErR8fV0wms+LuzG0DO4RnlSYonXzlcIN7Qwflbt+MsY6xfYqSCzyNgnzrR+CdeKZw9yrc4Sw= X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1451; 20:5ALtgoJIkuTEOmjPOoqECaoL/DAmHvvzmYMKvxw2Y06xFllA81lgBKY7NF0FIz424gi9dL2aWVPgFnsbHFBDf9Mm6HenxeWVkxpzDt5htUsXRybsrD4kzpJXPO0nETqBXJLvsHI6X1sVGQth1CQ80LkKvSA+7wonY9AimiCJFts9y4gtuv8sBlIX6rjEdUKa5dAjjKX8c2wIJiGP+x8dTBh1OFXyyICAp0ft2vp8O7gm/VkjZW1td2cogyU9J+HykHpasGjyTTMzvj66sYNAvey6z1A6M0reu5peDKA+g0kMdwZT34GAzt0aPlvPbKRwW4ZduSQfQVxQWWhIXCtLU7hmxJIeM44YL8U0U41vKWxUZfiXl8e6za9Ffg7vmhE8a8BTvmBnp+iYWsBhyGZkXZKUWLpxU+5MGfIpMP/fCVDUPJT3DVNsN/zBcbOF0cI8RmHIH4OuHAViW6gzudbpKkl9tvo7Rv8C2xmckxcgfHENLRE5WbxCkwdnwQ1EoKqQ; 4:G/A9rfIzYOL7hY4FIC8J+n4OTf8Z7U7djKf4dbcs57P0JsSVoSa55OHcp03g6lyMfLLNaxgWsPlZrEo/hSGWeCTrI4DtS7doVHBiLq3He8DgAhUn51+CnGy1xJOmjt+pAmISWJqrBMk4Q5b8vJSnZfNrzM7E1H24X9X1qssV12nJiAhf8orL6k4KYkuWqzQSKoJpZMwblCHo2vQFX7Dw/lMmMJYCqrRyKYhMFSQCqCn/ZidqhsGIIy9a2G4dJVZlRcOTVL8kWuujMvjYD8uz5+4GSc4dQ+B07k6nK4IYJuYsq8iirGQ/PKkp+cnG7Ve2P1uDFrIO+8JwXEF794Zphsxct63/ls1r4jhTA7F0WffsiWbWm/jwgbQLFnkH5zqCTRPQn+Fsp9tMQJIH46PByw== 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:PS1PR0601MB1451; BCL:0; PCL:0; RULEID:; SRVR:PS1PR0601MB1451; X-Forefront-PRVS: 00286C0CA6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(189002)(199003)(33646002)(586003)(47776003)(97736004)(7736002)(54356999)(42186005)(106356001)(2950100001)(66066001)(86362001)(189998001)(76176999)(110136002)(50986999)(4326007)(305945005)(101416001)(7846002)(53416004)(92566002)(77096005)(19580395003)(229853001)(6116002)(50466002)(3846002)(19580405001)(69596002)(4001350100001)(105586002)(23726003)(81156014)(83506001)(68736007)(8676002)(36756003)(2906002)(46406003)(81166006)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:PS1PR0601MB1451; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; PS1PR0601MB1451; 23:fNzI2ie2Hc9LB3w8xtcJlXu25P23hyiyuM5yV/+?= =?us-ascii?Q?AcTYPoAMdDMiMQQYH/xiNzhwtw25bOua0WAE9JZbRRcOtQteFJXpLc+ppshz?= =?us-ascii?Q?LrMBc4tG0bu2L7QBPZ6xe01oxMic1Rii49DWNT6eYV5/33fp064IJzx2Lujb?= =?us-ascii?Q?rPGJmNdSmxnumGDv6bNjvSPWSEhpZ3k4jwmdWZfVLg3T6rjuia0xPRCwhQyf?= =?us-ascii?Q?YPdn3Zt6FboiB9EQUlpvGu0XNEbYUHDlUm2tE5LawKfEy0OpIjkHPdYWJQ7A?= =?us-ascii?Q?mDwi0MUWB6hCjvqAnipMCyYJj8KfXabk216kJCNNN6bNpEfyQonYR3+mezph?= =?us-ascii?Q?D615tswDc6OgbsUaDgeUhK5NFWh7dvMHQCeNQ/vtr1ANICufdJxu8nIMpL6g?= =?us-ascii?Q?rIZ5hf+KcKzzLMzSZqAXc+4bHfcgCVcDBvJurxpik1W5uWPMG90Y4xETKolp?= =?us-ascii?Q?DcopkLGm8C/f8M+zOYh/4eh9SjO3L0DBDQGHG3Byktvj3Fa3Jk9tHVk5QsWk?= =?us-ascii?Q?UWfIP6E6lDqmw6q96cQZfsnLYuD1WTe1CPX1GDNrVp6sb3EIIhywt4osQldM?= =?us-ascii?Q?iK6qOsvJ5k2KQ4MSW2MD/uaEp6ITWZjEpPoxhVD7oxEkqHnv9B+v0LUDb10I?= =?us-ascii?Q?VCRBWINuGGB3IFrUjPXxcXVS7MKsWyI/H7gkXXDpuSS1xJ3s8TbSAViDNuN4?= =?us-ascii?Q?6BFzZGTNIqfw5Pgk7JiKOLCsKwXkTClOQnkTu6pWDs1jnUKbrCWyE1D1SpTo?= =?us-ascii?Q?HAbJZrntLh/nYg/tKrNSzZ33059oyW7YHn8/Zdih4Hzt3JFa5OIn8H9R1dr8?= =?us-ascii?Q?5JI8a7dxplPvB9o8MIR7qPxg6xK+MIZUTHCz3AU0zKwalqStpjUhAtesJ8dY?= =?us-ascii?Q?+NACWJRTAqsrenqRkUTrkrXTBDp3xWt2dSq9cBlAfDiwOJptKmx2ps472tkg?= =?us-ascii?Q?4v+VJpkNVZhS5Oi8n0IElUox0zc+bqoqL7sjB5MBQ1hwJrq6lw8Bwgydo9nF?= =?us-ascii?Q?jmeYM7h1YSKmzwXtIm7qr7bRuHpTDbUEnCbp3YJRkRp2mUa5WnIOU5J/xNwb?= =?us-ascii?Q?pPjj+H3aAJdf+4kbs+IUYOuVJsB3dDkEHccjEk+3MeC8U9eflMFp3jv+P1QX?= =?us-ascii?Q?r9on1HccOIj2IsdT+WVCogW9qNxRyzUajTE7RKI6dKYHvl/jF5A7UPA=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1451; 6:fxWJ6+eOpfcvumhBzQJy+myrigDPyAiiCNOJMF1+LmggdQ9MdxdQntJKuhUgp2Oy4mTLxzlL3iNyuyqUTEXV5vjAQQ/CJpcRCnZikGdk9zs2J5F8Pd+e3lsvo3+EVk3SNDmYvTyxjCTNxjQBj4Ywf5eliUf26FiJdpxpMeCHCx+kQqLeg3um3YTEbedRRR8qnyAEBPHa/lbXDKznLjdLUzkDbE69TWr1bdsYKKPtPVde6A9ZqlMZHk89WL0XCyoqs6lvmFYx2w9zsGsUs3kEGtUz9pIA5K0YhaDOaWhyikUxenAN19uj44ohl09Dv88IPAawvRvYdImINHHZ0+XNjg==; 5:6tBDqwBsa8phzGYn9Uz2GwCV83hywctptY4poTjE26iFxGN7ZicWj6vlojnsEsQauBFteNB9amxByaTJZvRNSRI1JsP+jZCriXnI8DLFqq6zmJjwOcYwL2cIivME17oGrlEpwYeU79DuF31RHuUx0g==; 24:z6njsjycZCNeDy+97uFnggjJOIj3qSMZr+TfDWXezB2fpNKEoWz2B9S8zKdauG0H6bz8gJFv60PiMyc6wv5BuJ6/HSTGCtDyUzWFY1ukEvI=; 7:4VI8fe8k0sYbi8hjPPXOVo2pilVVbEym1WzKrEAFzWQCzsRfY/yE46RtOx9bHNWfvk9YEpTZAU6w3FqHiNqadBoeAMElqPYpzfn1e0uswJtxiUZFTXL1ze5nX7dDJIxJujYmncTx1EdXvWcg/hvwPaqOMba+ygHX7VKzDytn7aFenSdxzZx8AMDzXTUpBZfaE+qObXp2pO8AH7CZolpZc0jOHVCMYh28ReDBfMIJVUuhvPLKRYg1jtu4xAUBxiaG SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1451; 20:GuW3H1EiwQjS0tfcMJQP+bvM5oqEgE5ehA6EfU9YgZvJroFg6y7DX6Z1DqGMwp1sZ+zcBVwy3Ko6u2tBAL48Dq3sFWM+7KhWH3XmZ54pF3n452MaGXv9B5JgIF6PSsEUWhko3v5oShbWlFD7UP3yzxnZ+jFdldWFlYNHbM6PbIU= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2016 09:30:13.6786 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: PS1PR0601MB1451 Cc: linux-renesas-soc@vger.kernel.org, Linux-ALSA , Simon , Liam Girdwood Subject: [alsa-devel] [PATCH 138/159] ASoC: codec duplicated callback function goes to component on wm8350 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/wm8350.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/wm8350.c b/sound/soc/codecs/wm8350.c index ffbf3df..18bc4ca 100644 --- a/sound/soc/codecs/wm8350.c +++ b/sound/soc/codecs/wm8350.c @@ -1594,12 +1594,14 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8350 = { .set_bias_level = wm8350_set_bias_level, .suspend_bias_off = true, - .controls = wm8350_snd_controls, - .num_controls = ARRAY_SIZE(wm8350_snd_controls), - .dapm_widgets = wm8350_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(wm8350_dapm_widgets), - .dapm_routes = wm8350_dapm_routes, - .num_dapm_routes = ARRAY_SIZE(wm8350_dapm_routes), + .component_driver = { + .controls = wm8350_snd_controls, + .num_controls = ARRAY_SIZE(wm8350_snd_controls), + .dapm_widgets = wm8350_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(wm8350_dapm_widgets), + .dapm_routes = wm8350_dapm_routes, + .num_dapm_routes = ARRAY_SIZE(wm8350_dapm_routes), + }, }; static int wm8350_probe(struct platform_device *pdev)