From patchwork Mon Aug 8 09:33:47 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9268205 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 B2AAE607D6 for ; Mon, 8 Aug 2016 11:47:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A27AA271BC for ; Mon, 8 Aug 2016 11:47:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 96FC328169; Mon, 8 Aug 2016 11:47:38 +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 4E660271BC for ; Mon, 8 Aug 2016 11:47:37 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 36142269181; Mon, 8 Aug 2016 13:47:36 +0200 (CEST) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 3E30C267B59; Mon, 8 Aug 2016 12:10:54 +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 1C011267B39; Mon, 8 Aug 2016 12:10:53 +0200 (CEST) Received: from relmlie1.idc.renesas.com (relmlor2.renesas.com [210.160.252.172]) by alsa0.perex.cz (Postfix) with ESMTP id 24763267682 for ; Mon, 8 Aug 2016 11:33:52 +0200 (CEST) Received: from unknown (HELO relmlir1.idc.renesas.com) ([10.200.68.151]) by relmlie1.idc.renesas.com with ESMTP; 08 Aug 2016 18:33:51 +0900 Received: from relmlac4.idc.renesas.com (relmlac4.idc.renesas.com [10.200.69.24]) by relmlir1.idc.renesas.com (Postfix) with ESMTP id CCF6B51B75; Mon, 8 Aug 2016 18:33:51 +0900 (JST) Received: by relmlac4.idc.renesas.com (Postfix, from userid 0) id BD2F1480A4; Mon, 8 Aug 2016 18:33:51 +0900 (JST) Received: from relmlac4.idc.renesas.com (localhost [127.0.0.1]) by relmlac4.idc.renesas.com (Postfix) with ESMTP id B1CA548014; Mon, 8 Aug 2016 18:33:51 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac4.idc.renesas.com with ESMTP id UBJ18454; Mon, 8 Aug 2016 18:33:51 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'";a="217448495" Received: from mail-pu1apc01lp0019.outbound.protection.outlook.com (HELO APC01-PU1-obe.outbound.protection.outlook.com) ([65.55.88.19]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA; 08 Aug 2016 18:33:50 +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=v8V5M7+J9HMb/A+aDNvka8uN3rkJs+PhEjKMqOJ5kuI=; b=eq10+3YGbxP0BBWlMgic4xN6k268bTRoVkQFJ72HtDlKiyZ3gTW1LqWA8w61RkFOURYPtkzZLNuPsxuhDw+R9utdZJDCWGFj2wZBy7hEVZ+5+Qwje6xi5Bp5iOPtmSZkNBE/dM1TdQGCC/L3gjn1CHEMrGhpulSuZwl95+vWNHY= 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 KL1PR0601MB1446.apcprd06.prod.outlook.com (10.169.69.24) 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:33:47 +0000 Message-ID: <87wpjrzk63.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:33:47 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: TY1PR06CA0042.apcprd06.prod.outlook.com (10.164.91.52) To KL1PR0601MB1446.apcprd06.prod.outlook.com (10.169.69.24) X-MS-Office365-Filtering-Correlation-Id: 676ff7b4-4844-4b2d-f25e-08d3bf6f19c7 X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1446; 2:iWJuPKfJS4mYM8oYD3bQcHcjg1g1Y9wQNNI0mCmaKr/cjcUHSCaODgFJim75JB3S7SPsA5Qu3Thk/f2N8dYKhpOI018vQqpQNPQcYqAvcATDbBCeRkYCyHDPuC4HGQp+OxDWl2xtnU/gja6Uw4NTNHKUu1wZ3Th400KVuL8RPxCp0feT5aPA7viwqsQllT+s; 3:/SqI+43JlHUU4ZovvXXomblUKzaHAQ6sv+PIw+E/+M891uwpJhkQVTXT2RacE/KpUeCd7yJLPM95ZykX/qmoHyWu2PSc+nprWSkOYz99047kDuVnAwF40c0M92nZ4G5m X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:KL1PR0601MB1446; X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1446; 25:yq41Y8guj4JYsaAs+t6NyE1bVO5m0mcU19bLA87joNxCqd+6fjC5C8RLaIi/s+P50ophKl9O+AOFqk+ZWGsb3WmFb9fDNUGYnDzOGRJ2asXjzLihNr1hAlXpy8pXcoencdTB1BqZYw64aQS02yrMKCw3hLjULuPRRISqy5JDGdLIJs99mqR/246hMH7U/L3gPsDkcJ7EsruIM2vWqN7SMc+Ov4Qz5yFvx3CyoPPGb3frHycpXrl87caqYbNtdEfOc3NlxuKnZ2GDH5Y7JwjxiO9UcJ80R3ockU3/Nh9exIxYsnkgH7fO8XHsvVJXQoy0sIKlkdU9EoW3YEYo+IAz5OPbzfNYv8G2V4YFg5wxeYcmq64P+TcSe2PuqAErCrnbpwe+zeY+p0OM0SKAxYUGb2lTWyvbNZDJ6DusvWgxwyvcWXDb+MGQhittU5KgOhXKvLOz/G67Z1lgoBQtLsDc/HcKwcpmKXmU8LD1TCFKhIC8QGkBsFN6VhBJC+NiMC3Ks3L31DXz8WIH2vLDfJqUjYeUpH9Ffd80GrRz7YpSBE7Onji/sgIZ6XtWdBn0czUA9T/WbTSsYwVWJJBNyNa73Z0YW9T91d5QRTXCr25UUhZoylNFv5MN6o1EmVifwipqseh6pNB0CXqEGN0exKFqqM8WJNlUwRDZDAkyMDxxiie+D/begD6Af77aZs7tkEWxTOOTVQl3ZlABy4OIFbKbuA==; 31:qNZ/uY9i9vU7bQZWNc2BNZxUrHVYI93zHt22OTw1roLKsFJ3b7627bZne1IZwcR0qKI4BS1y9GCX8x1NCA6Z0jrGZ/aqh2DV7hh4Xs2Hlqti6PY1pgPa++cWxPmC4q5KEKw1lNSbfVfYu1UW685E50v2OFrba17VNcEYxWm15nVP7XJ1LGCz8kae3prbmN21fvqHM9UkNLAeKJRRfc9m4Bxf1ZBv5JHaTGOsh0GuIN0= X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1446; 20:nYLTh8i4jAZVBJ+Z9wAr4f0Ud+0EBzJ+Bz1CdN5ovs2ANvA1QVrm+BgAGaVTnlTob7aKfgGgjS6+d2ZP80pMtuDJiUWkAuTSJzQg9qgDGhWR+sCw6RSjMiNUM/3SYFUPF6Gz959X2pyYe//1xcySpAY4j7VaW4xsndA/Gz8B2xmIAJE37LU3+H1GDU60I91YIIWG6eZo3A98LrLbPbTg3dH2SwYveDLir3SBSmPTe/cngxLcyYHgpJDJzscaOQU9lnXdQWbJG5GzyPYQt8zF3Y2Ba4Le2RsoPKkeOJ7isAJwDBl3VqcqMNfP63MR3htlLxB/pD1PnRoSAq3G80T19EeNwy22hC4VbA62ORqXxfEAnUqC9q3gdqxOq80UB0nZl6bv66Y+PIl7HyBCRFxf/8VKW3UjS73JiyOazOuDS3jYIG9mZwlcVZi0sflV+FzKBl776zm/G895ZhYZ9+lBh+Uzy1rpbnvbqAiLHUJnjDuuZbz4471EdqJdAepS1+U6; 4:AOMVj4ZknIxnbk+Mnk/XAevJK3hzOYevsvUBXl4AtJq1uFQIXq356qpqtXpU+5FTssqvT62wH/I+TV8rGl73CI8f1cSN2P54qXIDweorSgkQwaWgIeTauiWI6YoscBJnKrqEYqi6Ko9FLcPtSRBQy8SbBUa4m/GJmRG4U80NFqGr2Ek7i+JFJY8/sFIpIkeUjv7vI9miq47qHuZXLrKaA1WYzjeyQvaueegLgsl6IRmhMIn0bXXvTx6yHVkadm8gZc93/DhE03X4+d+o4pOwVSN3BnCc2wTX6kPMlJn+hfog4v2IPcQbEnz3U1kfxInN/9A6bPLCwZG75klDDRyQFE8s9Vy0EcYgJ6w/pWN1h2zfBXjmZbmwyhEXxIULktiu/hSU4CovHM+v1fD+j+eyIQ== 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:KL1PR0601MB1446; BCL:0; PCL:0; RULEID:; SRVR:KL1PR0601MB1446; X-Forefront-PRVS: 00286C0CA6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(199003)(189002)(42186005)(189998001)(305945005)(19580395003)(50466002)(92566002)(575784001)(106356001)(586003)(23726003)(77096005)(86362001)(6116002)(46406003)(101416001)(53416004)(36756003)(3846002)(105586002)(4326007)(8676002)(81156014)(97736004)(4001350100001)(33646002)(81166006)(54356999)(76176999)(110136002)(2950100001)(83506001)(50986999)(68736007)(19580405001)(66066001)(2906002)(229853001)(7846002)(7736002)(69596002)(47776003)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:KL1PR0601MB1446; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; KL1PR0601MB1446; 23:4Nmy5m74Bh1p4M1mFIJd8FLft1c1zSsymdvR9xo?= =?us-ascii?Q?suFF+gdMISdbN2TCICveJx1+zT4TGU2WDEoaaMHoZDIPAbhIOtSf0f/2i7+y?= =?us-ascii?Q?7E4kaYduZ/0cINbwtRsjMVrGCKXAYMdF4XbYwzWQGFZ5ZE1YXcRnnkW52WOk?= =?us-ascii?Q?Zjg7yMF0RAdh/YmJR69dydkxyDtb3usCd4qm+/8Ctwxh+b7/Bk37rjWfvlk4?= =?us-ascii?Q?TDFpF4YzCSQLRlXCdB25plb4JNCxflyOiVVH5OiO8F4yKpgOP/RUaZEIKDKj?= =?us-ascii?Q?CQ0Z5qNi3foch1rIQZRAThS94J5gapTSNkgLUdNYexCP6uvz0orMzBcVWBsu?= =?us-ascii?Q?VuL3cyazi72W125N5pAcHCtaf6/NNu3tkbJk5SMhzWgRmKs3lZ+d9ZeWvNgZ?= =?us-ascii?Q?tWD8CdixSg2XQSog8U788UvousfPKGiigTAjIGpH5Hr8foXhD/lDh7UyFxAI?= =?us-ascii?Q?W+7zYypQZFYSLpmV37wlWkh53FgzcjTCCQpf0ZpfhRkvyrl+uRsisBESO8zC?= =?us-ascii?Q?MHyM0/JZpGlrJ+xOkBbRIs9LarUvkLai+jFC20sW++tf1VNckmyB6PobLjDO?= =?us-ascii?Q?0scGvBndpYbZLPNvG1UCPKHR2JTXhcBXxYe8KlP35O7c3LjfHfPN3XzdWFi8?= =?us-ascii?Q?5ES1YwrkB7DPAu4o5c77KhfpdI0wYr442SnJOoW52/5drZPqzj6uZzJ8HcsB?= =?us-ascii?Q?xTgYzlHJq5gShXxHLp73g+UZdMRiMkK5BDQjo/JxwgoqsZz9TkxO6Sz0Rpp6?= =?us-ascii?Q?7sZ/SbPVrDOeuNAJBDDOwDCHn+VstFMfRrUsKiFSOWZ9oSeQcoLJ7LEBh6pP?= =?us-ascii?Q?G3Tolgc/0+JNK2yCVjEXyToMutDL5ClC/L/HLAMk8FafLcaq6QBpo1djpwtK?= =?us-ascii?Q?K74JU5oUYurMgPW5yxRTDk1vJ5BiY0PDY9sqrmQLgAYIXycy3IBr9RyBvXbW?= =?us-ascii?Q?D5Dwb2vn+B5c+RLyWyeK0Leh4QuQeX0pXTrBNbfEjRhIDrDmqAsJEWJwm55i?= =?us-ascii?Q?VkDwnGtE9hudnxRnIZ1P5peMlzO4h/d1O3onXvWGxbq6/4k7RccXy0iG5LQW?= =?us-ascii?Q?0eOoAjfQDqzCBe85l9TpngLWUvmSR3gtvXufcWJy0x7uakWuAxcVWegGC0Dt?= =?us-ascii?Q?/2RBFjvacH7i0b6x8AVuGiqxRi1gckM7JMqZfeeTzUN3lexgPthwvWDuLBjP?= =?us-ascii?Q?3x1jz6wbeKjTX5SQ=3D?= X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1446; 6:dDzDN/oZevVb86PTHdQy6YEuZce6FvLlbDz3AULGv6auUVmpGBC5MgwWrqzT4eIBcQNAO6zF+rP/YuXr6B+tpjmNX/Dr9mpT+eNUdlQ+Bh3mVoh1u6cfyY2MTs0qasgKVIvCExM0bul0O6GGtI5hKTsh9xImrHJSiQNATzYFZp8baweJBaoFQmCTlBvch8EYQ5MSjJJWDtFhvZ+iI6eXSruSt/HR76SS8evFE94dgPqS3VMthAckZyR7MfcajnxtufONtIDaPnTDxhqMXDIPfsEwJer3hRql9r7u4ydzKObQwfM15tT4csnH4Liot9Qcs3RqHTcw7E1javkRxDLIdg==; 5:UfbTP8uJ7yMwD1t7Qgt0gAtFdUnoZ44yUIvvltlyalGNKKodS/JPE0NWujDXB8cNnuojlj3CGyOWD3T72TQHRyI02GM9pg3KXbQcDRlhGeuB+dxw4VTdXR8rK3QtCQIRwXrDFdy7hsbVbQx8VWOt/g==; 24:gOftiERDkLuH5Cyw2/u6jkNNS8D618W57Tq9Zp+rOSN3X3y7oNRsRI2yCFiI1hvI3IAGTsW4clLAmJgPtGN+jqNwz8co+OwOnQinnn/DPKc=; 7:/iMuP+7G3skEp5XUgaOT0UAUd/Tf4MfxGUZu7w3f4NerWJiwn/RsdXvAaqBZxNViI4d2YUZUL/loGYCCcJ5ypFv4B87SPbbOagfkDpZ7uA0u/Zcnnqwws3PaSirV0b/srRUR+xJpvkdDZRjhrThwb2EgQaeA0DWjX8f2SgI5dmbXxvsSwf5UbNwCgkYRxrOBZq1kqE2ud8X/pFiLFy+6Fc173OPIK8YC1FkmgYaP+PDnAwttpd7aPJv0eTtlHJQY SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1446; 20:GzHlPj0lWQxln5J1YBP3nv5AqV6HRZr5+sqBbjAn56xpPiaXZVLqG5ktrB10R6JjUZy5ZP81oGeOxpKCHMjJD/iWCFbFw0lDDToCVPERiiHpZB1HRlboVndzf0WGwRxrHR8eqd9r70rkpMC4kgL/yQsb1gEXUU2FD4B5YioRt3g= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2016 09:33:47.7925 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: KL1PR0601MB1446 Cc: linux-renesas-soc@vger.kernel.org, Linux-ALSA , Simon , Liam Girdwood Subject: [alsa-devel] [PATCH 150/159] ASoC: codec duplicated callback function goes to component on wm8991 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/wm8991.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/wm8991.c b/sound/soc/codecs/wm8991.c index c9ee0ac..5822d10 100644 --- a/sound/soc/codecs/wm8991.c +++ b/sound/soc/codecs/wm8991.c @@ -1236,12 +1236,14 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8991 = { .set_bias_level = wm8991_set_bias_level, .suspend_bias_off = true, - .controls = wm8991_snd_controls, - .num_controls = ARRAY_SIZE(wm8991_snd_controls), - .dapm_widgets = wm8991_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(wm8991_dapm_widgets), - .dapm_routes = wm8991_dapm_routes, - .num_dapm_routes = ARRAY_SIZE(wm8991_dapm_routes), + .component_driver = { + .controls = wm8991_snd_controls, + .num_controls = ARRAY_SIZE(wm8991_snd_controls), + .dapm_widgets = wm8991_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(wm8991_dapm_widgets), + .dapm_routes = wm8991_dapm_routes, + .num_dapm_routes = ARRAY_SIZE(wm8991_dapm_routes), + }, }; static const struct regmap_config wm8991_regmap = {