From patchwork Mon Aug 8 09:22:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9267345 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 10083607D6 for ; Mon, 8 Aug 2016 09:22:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F40BA26220 for ; Mon, 8 Aug 2016 09:22:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E8E0627D64; Mon, 8 Aug 2016 09:22:31 +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 5FCA526220 for ; Mon, 8 Aug 2016 09:22:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752140AbcHHJWa (ORCPT ); Mon, 8 Aug 2016 05:22:30 -0400 Received: from relmlor1.renesas.com ([210.160.252.171]:63266 "EHLO relmlie4.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752375AbcHHJWR (ORCPT ); Mon, 8 Aug 2016 05:22:17 -0400 Received: from unknown (HELO relmlir2.idc.renesas.com) ([10.200.68.152]) by relmlie4.idc.renesas.com with ESMTP; 08 Aug 2016 18:22:15 +0900 Received: from relmlac2.idc.renesas.com (relmlac2.idc.renesas.com [10.200.69.22]) by relmlir2.idc.renesas.com (Postfix) with ESMTP id 9CB194F831; Mon, 8 Aug 2016 18:22:15 +0900 (JST) Received: by relmlac2.idc.renesas.com (Postfix, from userid 0) id 940A12806E; Mon, 8 Aug 2016 18:22:15 +0900 (JST) Received: from relmlac2.idc.renesas.com (localhost [127.0.0.1]) by relmlac2.idc.renesas.com (Postfix) with ESMTP id 8F7D62806D; Mon, 8 Aug 2016 18:22:15 +0900 (JST) Received: from relmlii1.idc.renesas.com [10.200.68.65] by relmlac2.idc.renesas.com with ESMTP id UBB16639; Mon, 8 Aug 2016 18:22:15 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'";a="216937685" Received: from mail-sg2apc01lp0245.outbound.protection.outlook.com (HELO APC01-SG2-obe.outbound.protection.outlook.com) ([65.55.88.245]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA; 08 Aug 2016 18:22:14 +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=2XHy7QA0ywBqV9ExjLTjt0vRJjCaLM9eVmQ3ooXO2t8=; b=Nud3ogP+n0N3ix0X0Q6u1EP7DEZLRQJU3V7FZCIAtcJEZnC0b93+x4nJsi+NGviqsd3r7E9anQAkCAuyYZWxegLeaEiqeszVzW46iMB6EvI4Jz2eB0BucNKGMdm4cJ0LmneszRnw0nZ5j9CfoFvzwTTKlPGV7MOnzC5nPPvAlF4= 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 HK2PR0601MB1443.apcprd06.prod.outlook.com (10.165.182.149) 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:11 +0000 Message-ID: <87fuqf39n6.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 112/159] ASoC: codec duplicated callback function goes to component on rt5640 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:22:11 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: TY1PR01CA0022.jpnprd01.prod.outlook.com (10.161.131.160) To HK2PR0601MB1443.apcprd06.prod.outlook.com (10.165.182.149) X-MS-Office365-Filtering-Correlation-Id: 0040efea-f023-48af-5f71-08d3bf6d7abe X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1443; 2:u9v5kntNKdy7HfScqzaXeZjQMAAH0dVfAq+AWd2ZP4ZIrewMwTQ5tat7ySsAnePMhY/kaiWEAIKB3FoqRuNI6h/WJaopEym2pVLzOBEoXvSNaVIVxzW7KAMc3Fk7ITrXY9d892ijr3lUl/EJBAlCllaJrjRfwe8jo2jnfimkueCFwOGqYWnwRbOv0g7f0Y01; 3:s5HL5kuUsnsuo3wYbpzJJLqbTk4TXkbqYeNUrcW2V0nb2Au4kSyj+zgD/VsuRoHy5Nlqs1KIZ1y2asegQOBI4m5DixyuTUKdYumUwbgX/ESPzo2KjY4crlFKgc52zDz4 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:HK2PR0601MB1443; X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1443; 25:kTDIvS8yxCyKLttp+j23W2l5Eb7MZP13ub3L4S8Rlm0uiaaIrHJ2rmOkyWzrN6VFsQPY/nzgP36pvVPyKxTsqDINQpsEj+USpPGgEuzTBvbsQyyP363Ik/CodYLrYur4rRA8pMGsb+oEIr4wMVKdvxckuDosAvmE4mNZaZcVwzEOLzWBtqew3TpRN0mNn01xAjPznac44F9ROVvpUaeP1vHd6CveapZgnhun1LJPUp0vuiEmFmCqQAkZDRwS1sFLpT6W8RopIOlT8SsLNASi+V+gmKp8QUG/arjtxNz3Q2sunWX4b/xOnlOCSjqHmQ//KdtA8aywIedo7mCG36ZXGM1lmcI2RKlwL0MiXWla2L9DSwUCRNvyFMMyCY9Hjk+MkBv/4iYbgknS7YVlCb5WbXBQhj1Hwe7vtj+7tQzjZ7e631gpO9ptDKIN6sE9wB00jhzu20HbBLExt58jGLfK3nHv+MNPD7WXBNfekv/El0G9UUmcVczKgYHi1ZPq5B2LuqlGcbhig8GsW67n9IjHVkn31p0zCExS1jmIhmTJxO39wKMy5t1W4tqBVS7nkLCOJkmEj2v0SjYpBC/BiGM1eR7jmE8rUWIDcTgI8S1HtlAuaCys48fG3jaJC7yeUbLlS2Vp5ogXrL22KIHD8/+dvUOT24rnN1uRKgZSqAjgtTR3Vr4QVZNwUzpulEN4/751zybmWA+f+DWMADg+M8KiMg==; 31:qP3dykhXT8l4BQAHztk2rgkgBWO8US+z5k9xpn92mKVLRrH+1BjY1Ews75fTQ2gppPRRMxGvxsRsm866rrYTMtJ1c249Bh36+AG2UBhFu06sr/3ix8sujD3XmLvgU8emBOJwuYXBFhg8vp/f62Tda7iNMs5ulV3FCgi9lRoNQ6k1BeeNH8fepQc8XWxBF7F4FbDps2bUcfY 4/jxfFiiZs9xF198WZfRUm6dKiP2mx5E= X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1443; 20:tmO72growz58K4hohrwgltCxiLcT5gGg4zlEORwFyS9+jXQ4u9KDQyjvJzLzq5+3kveZG8vJUVH+nheDEwDBLPS2p9AssBnuoRvguWHzZshg0UQyONI24tN4iWjSJ3vktT1F53pR6CwSJ8ar9dNTvdYyGytFJhGtUG5OQsBLYlThumaCNCcqd4yFvqcPb9ltMGaEvn4wzinnEE7REPlr0DHkc/wESaPFdF3ShuqhBCv8kgbMm2HKgdaj6dZq82H8AwNEX151nwrVFYkU4emeneqHvUK4o4z1HXZnnHj6Pt+YVIUVecbz3BlfAZKLOHj7EasEeSCVBtG+B68V0zIBWFAsEWbfeJE1JUUxmfl0NW/VbvPPh+s7KkuCAt14jVE/S+ARXUfvMPbo3q4YtjWr0Y8d4kp+VGiQP8RUiqUzNCGf7vr2fkhEy3tOrKk4sElh+2F0k0HikB3vGcmGT1Uhq9xOG3Zy/eZCPSBNhSjanvzsna7aMGlQw2ncfnKtJB/g; 4:YKnQTQ1v0Q5YrRpYgdHmd7EU3Uv78/qNUmqJGcksCK2ADD1wm6lOJy5gGJHIXfXDFWwDmCK/0oJw6I7n6SExDaSWMwnLsqjaeNF2IsiHwHTlJc8eMLR0RWfiRMa/KF36+uYaE76/a6O5BSvojUNDPmAR4dLMF2fNlKDZ1wSsgxAuWgCTYwfg1go7S402eBPcVASWxkijy1TN1oMEFDzjflHgxlj7Dddcb3iXkzHr+4wJUwPKgmifyDVbFqdKeo89MtZOE+t7tWe/tmCQlDU3flmSkEeWrCMjXAOhUNzFmKrVk2afs6ArKxO9q0k4SVX3bkr3iH34ks6M3pe3vs0XyfKgVPjVsjhS1SgunBJTFzRHoTUkQlalSzYS4vvBHAmc 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:HK2PR0601MB1443; BCL:0; PCL:0; RULEID:; SRVR:HK2PR0601MB1443; X-Forefront-PRVS: 00286C0CA6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(189002)(199003)(50466002)(7846002)(7736002)(305945005)(83506001)(86362001)(92566002)(76176999)(33646002)(23726003)(8676002)(4326007)(4001350100001)(2906002)(66066001)(50986999)(53416004)(110136002)(189998001)(54356999)(46406003)(47776003)(97736004)(81156014)(101416001)(81166006)(2950100001)(105586002)(19580405001)(6116002)(586003)(42186005)(68736007)(36756003)(229853001)(69596002)(3846002)(77096005)(106356001)(19580395003)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:HK2PR0601MB1443; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; HK2PR0601MB1443; 23:D8GaHU8uiL0QtcT6e2NfTZCSj9zr4rSbSxITviI?= =?us-ascii?Q?Zx1k+sefgJTlyCPMWFh3Ied3SHSEivcVnMXLad07bIaccFL5rdMeRuS1wKrz?= =?us-ascii?Q?H2ABCCla2axl2O4+1Pcty8HjcIXnJIHlDypn1KisFPU3FDVa0Myj28k5192X?= =?us-ascii?Q?T8Rjy1o87UAWHnULkF7jGMnSdi81hAo716dDJaDxis5+RVdea+ea8xIM86zl?= =?us-ascii?Q?ffoGCgLlZDkxuUMo6TgVUDbjc3WUnJkpPMwh2Fvm/6xCsy0VCtVjkyc7z9wR?= =?us-ascii?Q?b8QpjMooq//D4/NCyUed28g6DifkUqrmN7Tg2QdHnMtTDofKK5LFw81XdOQZ?= =?us-ascii?Q?AtHURBuL8uaICUXlzqEzym4Mq7yLpbzTiMAP1mZzOZmLYpFDq1Qxwn3OZLJO?= =?us-ascii?Q?G0+LiirV5+bTcUQUFRvNBMQVVMnn5SqSvGq7rjMmChxbYMoOm9cN7vQqtCKU?= =?us-ascii?Q?5800JAmy9uKSIpbUmLzh71Xa7a0ZpFQvPRax4l7xMyncsjLRLULqtBiEu24s?= =?us-ascii?Q?prqMjTsOY22FjC6pe9t5NYL21VJXYkltQzXQsyHl3za2UO4LY4txD0kec4rO?= =?us-ascii?Q?bxDJFzRn6n/UVHshDqPLSCHxoRmBw07QLghlLJh8U+U5/COIyW9t0x7vo+dz?= =?us-ascii?Q?s9aZAu4i0j2H5+JqThKCjKk9bvMwQYCCiFyquXP3PTGVxtU17jO+2WXENa22?= =?us-ascii?Q?c6NtU70RVFcVDCfLI4WBaWjDtkwzBxeK4go4iU5pZyvkFxmJWhLVssIdI5wl?= =?us-ascii?Q?YFHHMMIXPVVWKr041HanTdna9PmP6M1gaPZR+fVDPD8K+r0oTnth6iy5iM7U?= =?us-ascii?Q?bd6axVSnCvtH8xg3NhPy43XwcAUUQAz1n3jPYlSGsKUqllrr45xIvEiJ9/v1?= =?us-ascii?Q?MSHtCtX3DRtE/vdkBEB9YSMoeoWt/MAMjudMoHeuL1rGo4a+9ZcnVt4U9qBb?= =?us-ascii?Q?pppkY/5J9LmYCvP1LZZjJMNKMEogIz5zRryQ4H/L667DCGJVJdtIA6xxz/pM?= =?us-ascii?Q?wgFftfk98oNQdyed1e7eIDmugSdKsYTqSlaWs2orWiLmZfnIBIwohfxdG42t?= =?us-ascii?Q?rP0LJOfn0qDl3EU4hrl+xmSaW5SlPlA3ZX0cCvjJdB45M8DD++pPSXfWTjLm?= =?us-ascii?Q?FlQ8sAYOfWCVA7RPNi8Gg8R8sTB9iB50+APISpoWbxenbiX2VHcLujw=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1443; 6:KEdEUHz2nDmzVfSKqhGB6Q7kxQGqYYyJtVvBHswKC7UyIYBpABbTFytXJsHJzsJmX8tSPC7kUTqY12jFwkovGKLFUCJZErK4HSBFBluG+nJihSCxsvco3tkFJQFHqlCNRw5nGABQn4SXl15EQId7QMLCXEIapTvMI5FVmeIXFH/mB0Ck3kLXoW2Tng010S18KOr5cQTJ0YLoVe/xEecbKVb4jpzUCioYRdo4+siPQAZSlOEylIg9ygZAURUe2PivkbnADTr9bSw8jvQzvVy9k8TZMfKCO95rsU111mnk6PfdZWPj5Z96rWag7sQpw4e1QoysfFuqhnCDpb/5Bc6t2g==; 5:cKKxI4RFHzDRmjvB3OH0p+poA3gtKdLdBcWjg4DNwI8j24/xq0vTBk3AV3tskNJlhKjsaQNuYYzAmXsqhwQXY0Tf0vgyosUWs95fqZf0TZPtwpjNCE+Xb/pfrbWA0bBxZmNWZ6XI5EyBGyw+ddcgDg==; 24:bTvy1EIfDFxQ+awHp2YcX7JjtdI7VcUjefCeAKBvBB+S6RjaXL4gfS3ouCDiWXX6yk3CJZU0STR3pYg5+ewUHZnTJXGbTKlUCGJv0GF7x2Y=; 7:VVqiExjItL3C+Zsqpwt86xbnW8h/yatTnHrbvfbPav0NO9fIJIPGRaCP3zETjclJDXvXB6EblXU2HRT7rZlWaiZnkq+1ciLST7sbs6ZaeuwGh2Be9fT+qREU8x9A25aOWn6CpdbVtlhN30HKRBLO3uFTL1zcsDtqrSjpjvn3qa/F7tH2v239O3xIy0yuiIAbBic4/NmOLw8JKEbxv+/nOLAPc/v1Bl0H2GCJUE1HkuuwemhFE5KiPhlQrUjYftKF SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1443; 20:x9i4RFeZ0LLFUK3VAGjiO5ondl4BvmtunVS9vN9qb2TKi9fiidcvBKWjjcgB598A+fG7El056wp4ny5WrWE0gWIeCX/U0W/nB8QcqHU981hWI1OituTfIYQ9fACHr6rbivB2rPRfRKPjEn0FUICK2JcyjmAZOrTEL7fplOr4BjU= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2016 09:22:11.6632 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: HK2PR0601MB1443 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/rt5640.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/rt5640.c b/sound/soc/codecs/rt5640.c index 09e8988..fbe3af1 100644 --- a/sound/soc/codecs/rt5640.c +++ b/sound/soc/codecs/rt5640.c @@ -2261,12 +2261,14 @@ static struct snd_soc_codec_driver soc_codec_dev_rt5640 = { .resume = rt5640_resume, .set_bias_level = rt5640_set_bias_level, .idle_bias_off = true, - .controls = rt5640_snd_controls, - .num_controls = ARRAY_SIZE(rt5640_snd_controls), - .dapm_widgets = rt5640_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(rt5640_dapm_widgets), - .dapm_routes = rt5640_dapm_routes, - .num_dapm_routes = ARRAY_SIZE(rt5640_dapm_routes), + .component_driver = { + .controls = rt5640_snd_controls, + .num_controls = ARRAY_SIZE(rt5640_snd_controls), + .dapm_widgets = rt5640_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(rt5640_dapm_widgets), + .dapm_routes = rt5640_dapm_routes, + .num_dapm_routes = ARRAY_SIZE(rt5640_dapm_routes), + }, }; static const struct regmap_config rt5640_regmap = {