From patchwork Mon Aug 8 09:27:14 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9267435 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 25079607D6 for ; Mon, 8 Aug 2016 09:27:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1492C27D64 for ; Mon, 8 Aug 2016 09:27:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 08F5627DCE; Mon, 8 Aug 2016 09:27:23 +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 A365926D17 for ; Mon, 8 Aug 2016 09:27:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751985AbcHHJ1V (ORCPT ); Mon, 8 Aug 2016 05:27:21 -0400 Received: from relmlor2.renesas.com ([210.160.252.172]:39070 "EHLO relmlie1.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751979AbcHHJ1U (ORCPT ); Mon, 8 Aug 2016 05:27:20 -0400 Received: from unknown (HELO relmlir3.idc.renesas.com) ([10.200.68.153]) by relmlie1.idc.renesas.com with ESMTP; 08 Aug 2016 18:27:18 +0900 Received: from relmlac4.idc.renesas.com (relmlac4.idc.renesas.com [10.200.69.24]) by relmlir3.idc.renesas.com (Postfix) with ESMTP id 94EBE5269F; Mon, 8 Aug 2016 18:27:18 +0900 (JST) Received: by relmlac4.idc.renesas.com (Postfix, from userid 0) id 86582480A6; Mon, 8 Aug 2016 18:27:18 +0900 (JST) Received: from relmlac4.idc.renesas.com (localhost [127.0.0.1]) by relmlac4.idc.renesas.com (Postfix) with ESMTP id 80DF148014; Mon, 8 Aug 2016 18:27:18 +0900 (JST) Received: from relmlii1.idc.renesas.com [10.200.68.65] by relmlac4.idc.renesas.com with ESMTP id UAA16212; Mon, 8 Aug 2016 18:27:18 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'";a="216938020" Received: from mail-pu1apc01lp0017.outbound.protection.outlook.com (HELO APC01-PU1-obe.outbound.protection.outlook.com) ([65.55.88.17]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA; 08 Aug 2016 18:27:17 +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=bG3SvRbLoVczAwiOfjgIM+x494wR60nY6Pb8Teag0Uc=; b=CR+iRJkkabzL5JJHkXshW8yelsZ8jBSRYpfOxdZQYbh3yu9Z5puLWu+f6SNCfZmkl9MzxxCPqW0XCqDQxthSnhMPtrdn8d+udS2xa9QxTH/D7I6eAeNOVLuBAza6rsK835ICaf18o9Uqpe4eBc3h0UKItG0s3ihFXFXbcHlvTdg= 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 SG2PR0601MB1453.apcprd06.prod.outlook.com (10.169.106.19) 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:27:14 +0000 Message-ID: <87shuf1uud.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 128/159] ASoC: codec duplicated callback function goes to component on uda134x 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:27:14 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: TY1PR01CA0001.jpnprd01.prod.outlook.com (10.161.131.139) To SG2PR0601MB1453.apcprd06.prod.outlook.com (10.169.106.19) X-MS-Office365-Filtering-Correlation-Id: c62e63c6-5fd0-4417-ef0d-08d3bf6e2f6e X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1453; 2:MKiOxZQZUvrjw/EpOJnqwCPsZO2obXedeg8A2EqT1n6jvYaecnlCRRwxqFcGW4AeKRYFWjf+ehamTRjnL9yAMp9Y9LFxyWVywJ5uxUY+Du7FJk3QB5i8xnZqytAgNqfoOBZ7WrfQeqBSinf1QWvXfopfgadO27taYHdSfU5dcGZK+dqfsCdDD5w89Ay744mq; 3:dNanb9dgAU/q+PkaEg0lZDA0gb3P4TAfQTMbdJog6QjScLmxoHyD3J/zipj42AaDg86VliQ/GGf76935zhY7QqOiLC/5ucvxlY2SD6cO9TFJv5cS/7VC13BxclC3Um9+ X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SG2PR0601MB1453; X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1453; 25:nhbQ2uG/KRbK/7YcurZ/wGBNX4yDkNVWCdx2guhyG3+scguNKPG4iGXudo4iTR70M0phihRtshIlsB9pMvGKAOvnXPWLy7TocbfxDYJys2y/3tuUFtxRnVLU93HdhS1tYxwrUl1cQs4iP0tsWEe2iT7Rcgi0SiS9jvF3aPl8lxpHUr50Xxoi+A1pfyb1QmYaEgPeYiHxxR1sed/B8Rf1IZc5YetLssjUfpX0mi8XC/1qPnq3VovvnzgIwygCEG3f3NHogYjTQ3xLZ90MvWwwRfNih8jxNvuQRCcXAnN7KDE0oQgG6qjRXiwvvtboqdwl/bWDIJayvCHvNa3rOjbJf/V69c7qyHTb8XkhG9DM02vQidXFXrlD6deBT9a9S1CHPUj7MhUtAJHzCiaXniO4i8hr3D25YC/lAaAfpIKo8fO0yJ4MZTiJySfXlZg5JWeFqVo/l7Iu3WqT+eevP05ucScq78HcL8ANs14uT2uMA6mN5uj1+zoVAe2lrASAea4+gnqzuLPwji2ljrGhUdAPAgE4JQt03OpAPcL6UhbIvLN03rylFzGbEQ+hECX1pkwqnMNO0lfq9U9lNv3tVRMuzosuo57BMz2L7HH/jYHoJlWX/lpz43neK4oGRhm+On1whTQCIBGEdi1/bHXpFDlTE9za5CuI5LJxqDXj1LXeBcbzmVZGLd9GE1rSG1mmNY+Xylei7LtwA2gP5uFGJWd/AA==; 31:pWjNdEQxu73YED5T78SLSpuDaP8LrwvR1QS2WLyLJCrVMgt/whJAqgKaroRtqZl3ZEOnTXQr0aPW2UX9uiXrapVs0ZntEWyFqwf5bqFGbKid1XlqJ5y3C34ucW3VsM8KbQTOeiOZDtWAko+90LgCVUSnK+JY0OxmkbBg4PcSlNJkiPMiCNa/vahCRTD70cvE5PGts80fyyF gEz8tMDm9AucAq38HMam2ixlC+kPC0UE= X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1453; 20:d1LKbjwNNmPhxIYjgtNgrxJ11WiQASGpQ/5hUFKu8WZCRX2svX9jSycTuWn9GusBoyeMN6whu28te/dsWX3WrIbdp/fnxWcx632aOViwQQ7KBlXvQYnxNxtqxJMkMaTdcVYhcycmKWtvDtriuURb41Mt2Y+Pqo8BzgE5s3pTUJpL54KxUxOsdFTKLEaxe+LVm1OeCq1aselDquBGXCfzRddcoIc+mUDXHaw5EDqJ14YNCHiHuaqtzxLHIHP5LbevxA658hiti2KJfbG2cOJmVcOabqZjrHk3ftl8EIVY3mUONfrwsq+HPNBxLwyTi53S3t9KRExSFM15e7r7hc8MtxaL/Loj4M4VLZI5QPmd1NJtsHoYCDh6ZaxfwM1WseWoo/5fR0G2ANpLpGBF8aNr71yJJDbtoyRKI1aYxGuACiP8n5dbFfcKnjPJhvyLGPmnsy2nq7J6rClTkG65SHPD1/1MhBHA3SIF6hqumd1kHKIpsW50hpfQHskOBkaN6//I; 4:Rq0v3pltMZYIL2y0SdHoK4IHk8WI6XOTSoJlHd8bcV9RBR8SGJ3iSGBMmVa0qIYlMLx46wksxmyShxwUrkLA8oYIiVynGW6cxO7nuRzHVWk8ygq8sTxO2bY+EjayAqSeGZGsFZt27c/8IEXvWRXYtNqHjXbJHSm1iaoTd1Y/42Z2F3i0s6umUI0g7NinwOlhPpEEIaLFqHTWB4AMznXe8ivbNN4HdHS0Bqs96plkxHM57n+MzDcR1ymIRvlVf2KJIIjgLMk4Cd8hhHol4z4jsIfjdky8AKb/HaPlfI0RHDgKfto4Uo9DxR2HogYyCt16tYl7KD4MB6W4vAyVe3eibR32FxmV7MJ6Oy4Ag9PJKZAWZTtgTw26R8sNHLFXJrDVrp4ehKE2XbD9s6lUUeOavg== 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:SG2PR0601MB1453; BCL:0; PCL:0; RULEID:; SRVR:SG2PR0601MB1453; X-Forefront-PRVS: 00286C0CA6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(189002)(199003)(69596002)(101416001)(33646002)(46406003)(19580395003)(19580405001)(50466002)(83506001)(76176999)(8676002)(53416004)(50986999)(54356999)(106356001)(229853001)(2906002)(6116002)(81156014)(81166006)(4326007)(23726003)(77096005)(42186005)(2950100001)(68736007)(47776003)(105586002)(586003)(7846002)(86362001)(36756003)(66066001)(7736002)(92566002)(189998001)(110136002)(3846002)(97736004)(4001350100001)(305945005)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:SG2PR0601MB1453; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SG2PR0601MB1453; 23:hXnQ8N+mn8hvkcsZLM7UBxOr/G/nHw3AcnY7QnK?= =?us-ascii?Q?AN7CaS2KGIgf6SFh1CfrOgi/HrYBedLzFIuT05c+A7+67GM4CsuZ5Frdi2d8?= =?us-ascii?Q?ouRVMT5T8NOtoiaU6uYqFpoTw8+FGpYlr7eCj4FH8GhkiLze2oKqrxwErcx9?= =?us-ascii?Q?/ZNm8rFGMI+HDLDU9QcINYIy1jBcprq4knlGkuN8QB72FPJmEazTDfCb/UV2?= =?us-ascii?Q?sT02JRdRZZiaEDy+wdWTLJ0SVxQMWdgtHwufs9FEgYeYmLGXz1c/BR68JODk?= =?us-ascii?Q?rRA/4ztuXmdV6pfyevwCR5EwW0dp6AkXc7stvu0KWMUH9z0WA9oLEGRsmTSq?= =?us-ascii?Q?VfjhJ6oVXKlFLxchTC/4O6htgOS6aiIORag1H4qDJkqhueg+A7ARzcLRneaB?= =?us-ascii?Q?G7dhmPNEyC+si2qqDk79upHvCBfsDIPDJ8Vvf6E6Y3ZTayVc0UXanHt7T4aO?= =?us-ascii?Q?rgvjazwcOBk9bkH8841xEB6mLCJx8WhMU/OhSETVEcxV3FCksTvoKwSP5GEx?= =?us-ascii?Q?UdnFfhnFnaUPbzUy14AQcCJ/mwqOgzq7slf/pVrQBeREiOuB+ihTozANmlX/?= =?us-ascii?Q?5FNzc3a06/Ul66CSMZjcdW1Q/NTMvdZPLgmf3s6pjwxtpEDvfULeWnNqzKiF?= =?us-ascii?Q?ud7Kb9eTlKi6PRUBgP5hE1YAG4oFcNOGgL0lm93d5KH9An199hqvoiFL39IP?= =?us-ascii?Q?Uw+cgQqIzPtAkV0fwGz3rhK1TBM4uFC26nUfQGrKga3q3+ai7VnAYbt1kzaQ?= =?us-ascii?Q?/T/orxlaOqAxzwVPDTDYhnUOXSX+0TeFrWQd1uuWmEX2vtkyHUJOgvjktSyu?= =?us-ascii?Q?XLWJvOS4GTbmHOatXOJo+sarT2286s9IjEAthWTDCQc8gAil7HOjxBSxC2xo?= =?us-ascii?Q?+rbbOwfhuSKqEFBuYrCs3EQ0rh7kTrmHB/9s7NwyJE29Xj5B9chPNAdSagOr?= =?us-ascii?Q?mqplz5mGCRF+jXWFevb3KPbXDN96zqLgxb6zDuTuWivAcEt2i5veH8mP9m4A?= =?us-ascii?Q?ysewl2G2diarUBD7Yufp+4e/OIVBRVftXuBI+c1ICalR/L818GC+yuSReo2O?= =?us-ascii?Q?W8HRWYEsEjGG4WbFcRv8lkpLPRX7a3ASTJ2KAPFoSJyTsx112ZMrPlHafriW?= =?us-ascii?Q?dsyZiofFtDqm7IIdDe0N1/4bMAoYqFrtBupYqdv4MpxFC6EADfjJHNQ=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1453; 6:gzJGs9k3ewEA+NVoFhWym8cT9NMkGS/8pUjzmLTETwBtc31HRFGbUQmpnF7ZevAB9eLws2pVFJSl3Yyqp4D6mbz9WDIO8e2FMiWGsndZjgq0JMKJgZRyCLZwIvaPjyvKOK12dOfeo/pZ2+oEuSGh96zc3Uic1tAvPboTRy4tM4wf38aq8QuxkjiFejDoynoG335gbisQnmo12HpKRvcJF6i2we/AH52Oh8lTI6wxHL8cQa0iiXpfIv85yTz0WIb/oujWnpUs5TeHpRwpb2JGHjiY88b6rolEJtCsa6+7LRjER20ioryfEAhqopFzNfqYDFbmi8h1Zw7To1OgecRekQ==; 5:hJHTPX+EQQI6b7zkgmStM/dGd/IdCt+lmeWmWqv9wvZauhPf0Sk8rdNOn1S+6QklT3LlnrhMIp7fnUmy0u16cAmgP1ZQZHGqzF4NMKAwe4PFMrNlA7Zk0wEBOTZUvP1/4gU/1HqwCyHlXJV7779gJw==; 24:gJVCsCWfH85xlZoGkTppB9MAPOVtgZZjkuniQ/TgKgUJ+nEiUi7igSU+TcL06ex4Mz5exbNIQLdPFJixzqg4OopMtlPeeLGT7e+jW8/fBhY=; 7:cZi8VkQO9iedK/evrff2jCPpvR+jW+vmmjS6tglqtMPFKIQPctdaxicprg97CQy85QbN07QHNY/VD7NjABpyp+Pylra4xK1/pa+yWM1squsfYGnqiMsZkoCX6SDRB7StQBOw+90X13aJVUXp0lFaFXE5R8XumX8r5DE8ZJubyHUWqgOGYWODe6ZXwbR/yJgNckAVK/9kOWylytQyKZ2HLjs6eTj1MAOmQmari7y7DyljT28T469SCzcYMJ6y/Ktd SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1453; 20:pjy6VMTlqY574J6zqz5SMv+1kJN0wXyTGlTIihDvwH64yEtwGzL18FY6M9VbqeRzxHbT9/E+s81PFBCpXVjJXxeEiinBUn24c5rTvQdnV6pwTuw+q4rKtTCMDc54KhTczgQYPGdEzMwTgSoLOl9j4aoiq10AuVKDv2IPluUSllU= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2016 09:27:14.6914 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: SG2PR0601MB1453 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/uda134x.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sound/soc/codecs/uda134x.c b/sound/soc/codecs/uda134x.c index b72c925..5fdee87 100644 --- a/sound/soc/codecs/uda134x.c +++ b/sound/soc/codecs/uda134x.c @@ -523,10 +523,12 @@ static struct snd_soc_codec_driver soc_codec_dev_uda134x = { .set_bias_level = uda134x_set_bias_level, .suspend_bias_off = true, - .dapm_widgets = uda134x_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(uda134x_dapm_widgets), - .dapm_routes = uda134x_dapm_routes, - .num_dapm_routes = ARRAY_SIZE(uda134x_dapm_routes), + .component_driver = { + .dapm_widgets = uda134x_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(uda134x_dapm_widgets), + .dapm_routes = uda134x_dapm_routes, + .num_dapm_routes = ARRAY_SIZE(uda134x_dapm_routes), + }, }; static const struct regmap_config uda134x_regmap_config = {