From patchwork Mon Aug 8 09:21:19 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9267333 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 2F95C607D6 for ; Mon, 8 Aug 2016 09:21:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1FEB027D5D for ; Mon, 8 Aug 2016 09:21:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 144D927DCE; Mon, 8 Aug 2016 09:21: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=-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 9F4EA27D5D for ; Mon, 8 Aug 2016 09:21:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752437AbcHHJVd (ORCPT ); Mon, 8 Aug 2016 05:21:33 -0400 Received: from relmlor1.renesas.com ([210.160.252.171]:14287 "EHLO relmlie4.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752101AbcHHJVb (ORCPT ); Mon, 8 Aug 2016 05:21:31 -0400 Received: from unknown (HELO relmlir3.idc.renesas.com) ([10.200.68.153]) by relmlie4.idc.renesas.com with ESMTP; 08 Aug 2016 18:21:29 +0900 Received: from relmlac4.idc.renesas.com (relmlac4.idc.renesas.com [10.200.69.24]) by relmlir3.idc.renesas.com (Postfix) with ESMTP id 10AB2523C8; Mon, 8 Aug 2016 18:21:30 +0900 (JST) Received: by relmlac4.idc.renesas.com (Postfix, from userid 0) id 05F70480A4; Mon, 8 Aug 2016 18:21:29 +0900 (JST) Received: from relmlac4.idc.renesas.com (localhost [127.0.0.1]) by relmlac4.idc.renesas.com (Postfix) with ESMTP id 0020A48014; Mon, 8 Aug 2016 18:21:29 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac4.idc.renesas.com with ESMTP id UAF14086; Mon, 8 Aug 2016 18:21:29 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'";a="217447587" Received: from mail-sg2apc01lp0244.outbound.protection.outlook.com (HELO APC01-SG2-obe.outbound.protection.outlook.com) ([65.55.88.244]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA; 08 Aug 2016 18:21:29 +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=Vb1D9p9jxLe8RmcIWHj9iVYZQ8yhmk3V6YPyOgqJLnA=; b=I6G4F304YD7a+ONA/HabmEFGrYN3fAh8mpNZwndx8ygcHKSzz9WXvX2mDMv72woNo5Np4rrRwAn1JLChowYqPnqwn0Q5fkQtPZ2cMyx6zIRNTkcE7B9ClqzNc+guG5ccWO7QvFF0nX8glSAGGtPREQkVwcUBqldhciiUaW35oEQ= 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 HK2PR0601MB1444.apcprd06.prod.outlook.com (10.165.182.150) 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:21:19 +0000 Message-ID: <87k2fr39on.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 109/159] ASoC: codec duplicated callback function goes to component on rt286 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:21:19 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: OS1PR01CA0039.jpnprd01.prod.outlook.com (10.164.162.21) To HK2PR0601MB1444.apcprd06.prod.outlook.com (10.165.182.150) X-MS-Office365-Filtering-Correlation-Id: c2416e27-74ea-4f9a-8782-08d3bf6d5b9b X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1444; 2:eR6ULCMZ+eIev11KnJA972ph1jLCki4dVggJ8SY2yrR7NOOfTZtO9mEzY2UHl2LitpHZbMpMEgrShaC1gEMCXiTgdym+h7OB0Kt9p2bQZyegs3Z08DPKHWTQDPG+oHSc8g9mZU6gGZcl1g7QsCh7NkLb6nHdcduEsrGhiPBoyv1mu+/iCWB11gIQnhgYjsXo; 3:D9T6UV1qZP6CQNy+JrxYT7J3i2LICNx3nv9+OlslgyK9jSrPdPmv6ncWmf4Y4dJuBs8E+2j1qm36L9piDEflkEdY99RupvfU/42Y2cdLsUZ+Phq8wjBHaMta0mk9GKK2 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:HK2PR0601MB1444; X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1444; 25:o4u7g+kOm7C521/pTgiHOrUb8vNRYtuj1bFmvMubVmaJhVnrDnarH5eIELqDVFWzTmavLoSxKk1UcCz1mOO47JXFdoCcUdKXyBjMm4rY+LKGwa8fJKw3eujgLgWVs3t5l23O6G+AdflyPEamInSTRNfGDr0N7HT3zVw2Uy7eiyJmprc1218IrfpIXoSdB1i/kmCKMkpS8DL08pkG281McY2gIRhwh8lMIREiXCG+L/m9t2hoSZ7XHZw88rBoNYwfZLIy4q9Xfq4yfguWretUTVNwM4n6TcQhg+ew/ociiluFVMqOQoYgrBzJRXA/b/RfxooH+hCf4f17PvKzPPpUavmWNxPNpB+idPSZcVDAKyn8bApYK7+6obpJRl61lUvVqmTRBUSXH5ZzM/7OMS93b4g3M/Z5wMqKAVYQz43yCrj+Iyh8Exkeh0AgZkN9fkJAeQAXZIxoUOghhPABnv3z0Y8QEDx4gj3rTZtQhgw4vQLW2JsgvO5q9apm4/QMTOVU3QKgqHhDHFZvzzexlrAyeG6wLzDDvWICh7eZXNyGtE8TttROVQ/Ls7+cE/7ttoPjxWOLbr+8LB8UPcFxysWdrlhzoVO5zaPAcwI/4H80aOJHn8mKE3klQHXPYUouHkjljPxKzmvNuJn9+NrDhUcuGBh/K0VLBAbmdbD15HzCBQm18DQxhXw82e6kfVTrKCez; 31:iWUvV0goRbnrNFEt/hsRaEqrUgNgHTv+zp27+pQlpy5Eci7bSHwya/gkx574gXF5PVCML6yImQBAred2HXxk4gCTVQCdUrZ0vTtlhsUSHJl5STaGkVerUQT2SJzbTquVHZMYcLp0REl4A+pE6ELo0tBmTCN1dbW6Cse+iJ+k0T6lcX+A2nkHgBzrChyCgxMb12OBJo5lAsQQsiwPz7QJpFuXJbH7UV1tip2 wuIoEc4M= X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1444; 20:mg1IWLuXKYG8VCdxsC7hQJ79hXj3DEwxdpl9epobfdC5TsEZmyrYNo8UUNgOmpSOj+xxM9M8Et84AFGfTLX5ykEhkZiv5YaS8Z1+X5CeI4xFLUnlLrlgfNVyQTHdWK0VPzojWxzgNIuG0Mg4Qm7Ev8IyiAt8e3xreSk9T/IrF/TCBPijDNxoziHgy1aZncywvRcsNnSJSk2TAEFAOyD1FvSfP0JbLv3z02Nkvg8Tt5eGn0nG5ls3Fu17ihkf6WHvlMpzibKBgpMlR/DobQ8kq/mUibz3VxD336xohufp22VVaOGhzggAuuPeuYCUvyN4XszEIO5/1aVqFuKtNhrGyEcw/deCbc9elPtfFqaXRxZRLzcIbdQlkXSONblVBymgdX8SYYqMc20e5BqOOkbiWfDk9imVnpb3XSaQ9GYpFEXrZbfZpdmEOz2xzSBEFbSBNUYMyZvqbVIQEvm6bYFfuTV5sL46ZQ0CBvdYdINj1cnX5+Y17XHhdQzyV0XaaJhs; 4:6I5+oByjVHiliL3UdKHS6ZZ2yLuGNGjSI68/9PP5Wn0k5B03FknEN8245qTRWDaK50h5c59Bt5qMZtO4TIeGT8PMf8U4FWwf/VHAdy7A7QOrNtxLkezpHhtQWPwAWMnrZ3hI5GxIhc9R6LXfXmvuvaoDmSlmYs8zcMr0JDKIvNlCK7c0uVaqJKyQVLI+t7qSeu+aJFaUMzu7Owb4o1MRLSEIQmQzb0Hp3pKdpcoIfkjUVS+K5xoPE4KWS97I/QcB9GeQXrhdXtoqUCADmqWm8Mr8m5Q9wJyxLsNMFwQBFtfB2i3iiWNprQimVH4gXxNFsmndd5hmNMFfOYbKb7ZfiTJVsOyTSTQJU/OofZDILHqaidkt8FfV6PkwUmz8Fn42r4agSKbAkfU3RcyskFLRzA== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(5005006)(8121501046)(10201501046)(3002001)(6055026); SRVR:HK2PR0601MB1444; BCL:0; PCL:0; RULEID:; SRVR:HK2PR0601MB1444; X-Forefront-PRVS: 00286C0CA6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(189002)(199003)(19580395003)(4326007)(19580405001)(92566002)(54356999)(69596002)(105586002)(76176999)(50986999)(83506001)(42186005)(33646002)(66066001)(6116002)(7846002)(2906002)(47776003)(3846002)(101416001)(8676002)(189998001)(575784001)(86362001)(110136002)(81166006)(23726003)(81156014)(586003)(68736007)(46406003)(53416004)(36756003)(229853001)(106356001)(7736002)(2950100001)(4001350100001)(50466002)(77096005)(305945005)(97736004)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:HK2PR0601MB1444; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; HK2PR0601MB1444; 23:9l2K8OF7v/S/lNLvYF7a2/3CR4tuB1IvEXuWHIT?= =?us-ascii?Q?Xy/g7m68cC8cLlPD0e39XDi8xzImDi/x3OlMSqvIoNoNMovnAFl9WWp5QUJ3?= =?us-ascii?Q?2ER+xLrth3V+5Tfigz7VfcVxx+I63iL5d6XkypMSfFmVkNkOnDgtIGyi3XgY?= =?us-ascii?Q?0+EXKJI6LeR/EOULWuOi3BQ2WvAUT5rd81L1QJlE0RsUbWVhclHZ4BmR3bV/?= =?us-ascii?Q?9bl10Ar+RlQO4uwYxiJJEaJdh/wRyM2T9SPBaJQlbNtTD/7S36K6qd7Tatr9?= =?us-ascii?Q?yP7kQvIL0oeg0lEaD9wj0oBWHhZsyD+2xEt/lVpzjuqfqJxx7BKwjoD0FTZ5?= =?us-ascii?Q?sdDNRzFJQR0ti3Fd2E/+G425OdoLRmrbNPjy1jyW4XJXWc6TKpN7CKIzWy1+?= =?us-ascii?Q?YAs3DYlvj03B8jZ/N5WRTyqrn+ePGpxg9g1Rskpc50WxJ4O2xGEALUxgHfeO?= =?us-ascii?Q?BvL+UmJPeY4xEs6hBKTcd04Iy1er2juyEz6rzhc6Nyvfv2xHfpktDOP9Nwg/?= =?us-ascii?Q?gAl9mLczUQFJYy21BcATql8jlIPCR5feouQ3KNqmUbt+RAcj9jiRv8v032Fz?= =?us-ascii?Q?ldFktV+DAuCU8RvkyEUXVi5buPB4SZbGF1WGLKBHjf3DVEFS6rP2cxSjlgks?= =?us-ascii?Q?fpgIPrx5Hdk6z3/EPdDrsZMKOBN6lG7X6JfCXG+KHFKpNHCoYj/h9TVP1nxj?= =?us-ascii?Q?LkHIlFgKNALbuliNTqeErZtdr3y/XahcHK7wrTenqH/gVx/pydudcbLmiGJw?= =?us-ascii?Q?xX1CvviDk4SdlZcJsEmxvuD1ORRdyaMJRpUTE65RMMIm4uUGoBzGf7fV986N?= =?us-ascii?Q?sBUCwFUsKXb+a5oRKDgUAu7czRkdm5VQ19CxNqauBxVBtLBwTgXeXl+X45Lb?= =?us-ascii?Q?ZC92toT8QUf++FOxvJrE2FhfKK/hrIN8593BDyFmlQl99IkDQv4gBQrWyefS?= =?us-ascii?Q?b7ly6VJXsK5/pYPaxkXmIocS6SA0ppq7weyDEUqm5akyGf7MufyyPGAdLUg1?= =?us-ascii?Q?QrDn0hodhk7gR9oC+i2n0yUGlWmxVy4daEWX7BNJcwPxsCSB2pnWwy5A3S0v?= =?us-ascii?Q?aG4O0VHr61Q4n9rNxIkI6kKGAcLMBy8oZcMBQPgq9gaEDkjDexOAXc/dEnwz?= =?us-ascii?Q?cpmgT6zE2mSfZuXet/bL9353ELaRARmT0hIRl0j8M/xuKiXM4H3sU+udp5c1?= =?us-ascii?Q?ataRHfWaL/cOI9d8=3D?= X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1444; 6:mtndlvCcKFfYzG51QMHmvEHsHDwGXHeI7D3Aa/ycUJuczpalQ/8UfUp9sg0OkWEe07r71VlKY/71jucMI78nTxQb0b7oT0tAwrhYqZ+/qI4TCkU8Yc5ebnRUPFx4xcjgw2t540XEv3U42FgZfFvOPxenWYFQ9wLnVLV6Z0kxtJ/drCOe6mtgVQ4iR2jY9PQxmpPt2JBt2majuD9drVvj2eyXxOcT+iVAnVwLXEhwCi1NUW1d9PRXdLAj9n017ekLSyJIp1g/ffBYVz5oonrf2kOKakqc/W02eCSlX5G82RllDNW1HUrcJ2gbpI2KQ1RlIhdQvLJnqI2rVdaIXuKydw==; 5:8ucNdJ1GkzPZqZ3kIKWSOj6+QJ/vJSYHzuwyTwaOdVKHlQ+LzM4zXGqX0CC6d46wXk64jNCt1xC6TwNfdq2WaQC1ZNUfZdWVzO7GP1RZ3m2pJZzToFun+A2St7p9SzLgkY/L71r+Ix3iGnzAr4Enlw==; 24:FUZcn3Drflo1Jomh1HLXF8mWcc3j1PKMTlLDT1PVwdlSeRVVgFjTmu3y70FybeK//Rc5AD1CGWvTvJ8wNB/fpVDC6T+Aiu+vwRkF+n3eTw8=; 7:TUxkyaG7XdBwKfQ+cSB6rxTGk6pELoLtEGKW7x9FGq33XuQ2kICS1QyFAJQ6l7LFHQXKAFqWCjpbAVvUAGzEBYZ0uithuWWZj4NGEaC+V2cLKXqE79/gmako+ifGleZn35bZW68WBS8f2VnQVLMHcjPl9qKivLIWZaVsrfkcQpLYzIeMY6O16biOkCYDSaMJwyFO6mgD0kejfErkieuE/B06qlnnfH5Sq+gjEGc9QA3JU2uYIcX8zUDSLQUpyZHD SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1444; 20:deHjlZruKEY3h0foTf7s9SXr+EErDoAhTmJh4OVSEoHBYc6rCkfnd1girPw/kOgcr3mW2UhVWahk6r1wjHFT6JjEhCenagBW8MleP17nHixEcba02guEaJ0bGjKaiWzOtkUm/3iS11kBkrIir3OjJ6h9PW07EPNnuwhJw5eGoL8= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2016 09:21:19.3267 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: HK2PR0601MB1444 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/rt286.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/rt286.c b/sound/soc/codecs/rt286.c index 74c0e4e..9c365a7 100644 --- a/sound/soc/codecs/rt286.c +++ b/sound/soc/codecs/rt286.c @@ -1053,12 +1053,14 @@ static struct snd_soc_codec_driver soc_codec_dev_rt286 = { .resume = rt286_resume, .set_bias_level = rt286_set_bias_level, .idle_bias_off = true, - .controls = rt286_snd_controls, - .num_controls = ARRAY_SIZE(rt286_snd_controls), - .dapm_widgets = rt286_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(rt286_dapm_widgets), - .dapm_routes = rt286_dapm_routes, - .num_dapm_routes = ARRAY_SIZE(rt286_dapm_routes), + .component_driver = { + .controls = rt286_snd_controls, + .num_controls = ARRAY_SIZE(rt286_snd_controls), + .dapm_widgets = rt286_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(rt286_dapm_widgets), + .dapm_routes = rt286_dapm_routes, + .num_dapm_routes = ARRAY_SIZE(rt286_dapm_routes), + }, }; static const struct regmap_config rt286_regmap = {