From patchwork Mon Aug 8 09:14:53 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9267251 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 E29BB60754 for ; Mon, 8 Aug 2016 09:14:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CFF63212D9 for ; Mon, 8 Aug 2016 09:14:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C1EDB27D64; Mon, 8 Aug 2016 09:14:59 +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 55E04212D9 for ; Mon, 8 Aug 2016 09:14:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752051AbcHHJO7 (ORCPT ); Mon, 8 Aug 2016 05:14:59 -0400 Received: from relmlor2.renesas.com ([210.160.252.172]:35560 "EHLO relmlie1.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752044AbcHHJO6 (ORCPT ); Mon, 8 Aug 2016 05:14:58 -0400 Received: from unknown (HELO relmlir2.idc.renesas.com) ([10.200.68.152]) by relmlie1.idc.renesas.com with ESMTP; 08 Aug 2016 18:14:56 +0900 Received: from relmlac1.idc.renesas.com (relmlac1.idc.renesas.com [10.200.69.21]) by relmlir2.idc.renesas.com (Postfix) with ESMTP id C830D4F3F0; Mon, 8 Aug 2016 18:14:56 +0900 (JST) Received: by relmlac1.idc.renesas.com (Postfix, from userid 0) id C61A08002E; Mon, 8 Aug 2016 18:14:56 +0900 (JST) Received: from relmlac1.idc.renesas.com (localhost [127.0.0.1]) by relmlac1.idc.renesas.com (Postfix) with ESMTP id C100A8002D; Mon, 8 Aug 2016 18:14:56 +0900 (JST) Received: from relmlii1.idc.renesas.com [10.200.68.65] by relmlac1.idc.renesas.com with ESMTP id UAJ09929; Mon, 8 Aug 2016 18:14:56 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'208";a="216937032" Received: from mail-pu1apc01lp0022.outbound.protection.outlook.com (HELO APC01-PU1-obe.outbound.protection.outlook.com) ([65.55.88.22]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA; 08 Aug 2016 18:14:56 +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=CAMdW2KQ4D5MKcdD3K7KmLqKDjVkzZP9Q0A0ZsUyAWk=; b=Wgjp+YNiXG4dQJ/w2a2DbQ4xDivwxrX8VdDc+fjygqNag6Y/IHuz5wxreTLbNEUuMVsgVVpguyyg9gsGDzQjptc6v6ZobRMyEOFg0OiP6coCDm3O2OzGZVyZUwb6VfNinI7L2D3GMyfGQzU0jcWvcRkuojbaVUTxuKeZvSLLxy8= 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 PS1PR0601MB1450.apcprd06.prod.outlook.com (10.165.210.154) 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:14:53 +0000 Message-ID: <87eg5z4oju.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 088/159] ASoC: codec duplicated callback function goes to component on da7213 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:14:53 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: OS1PR01CA0024.jpnprd01.prod.outlook.com (10.161.225.162) To PS1PR0601MB1450.apcprd06.prod.outlook.com (10.165.210.154) X-MS-Office365-Filtering-Correlation-Id: 7889e4ac-bd55-493b-bb0b-08d3bf6c7569 X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1450; 2:yvur5N84QyRPp3UBQgSke7GTEOR7l1U7By/4GlgR1BE/AqS09flRogLlkGdod5ny9WJ6imndGtL6fQiOXqmsaHBX+seUu7pXMh3Xo6Jd1U3jQJZT1ARBZmU40AhPUs/nvAKLfyMI8a21LTW2nv7El+sPmr63bSaaRh5r9J0xKJI5WdsvdZqd1gmpsbROyiYp; 3:F64Rq/rI1AzlbUkbfngm5x/Wqb0MQO67CD2up4gVadU9cITXMnIDb0+5oTa7IvHBzCQJDyX4cTabfeIcb4ly3x8xIpvqvwScC7lfkfPyz32kkAI8myhTZJm6bVqu5iVS; 25:AJgInTxqJyse5jfRAebJTNIa6pQpQ2+eUPBpjfOojG7g5W76MS8Nzn2QXNG9SRk6++buOQcJYXVO5dGbuoT+kh2pRXeXnpOlVXXISwF708WE0SA2Am872DM9gjeOpr+XtO5tBLjbm1g7y4Ozr0FR9odwJkkHuhIbpbJtbU7LeousRbis3vxLWOsmFQNSkT8VJps3JMOYsMfkopMHv1XvkVOwxJ04odmYD/0VgEzNDha4IV/Q8DYmGXB3Tn+5mFfAwiwYh1rBAi4YUmajjT2ZOKh7Y5eIvcpaeG1Uz1JBtwQ4wAsdsrtRJ64n9rJR0o/LdULSB0mYVCfMm3QOJyUyauvYL6OWCYwNtJZColTHjoZWeIs48UOfSNEtmuCABl7aLkZchQGwMn+ZdfMaeeVdHoy4WMQLVIaU159+JMPsvdI= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:PS1PR0601MB1450; X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1450; 31:H+JDcd4AcpZdaEPMka5DEoTjerDUX9Q0zDBLxMXZBOZGQCWcz5t4xu/+2Xcuq/Tm3wlkrnox02WQpQZ+37zq9zOGEoNxJDBWvUQ/fWxLmtPsWf6owizW/tSIeZjUtjrkwRqQ7a+J1+L1Q4J0Fdev2KV4KrN265RmKrnQSmLYscnFhaKXwFttTt7qyVinYJc3qQTfMQ49UqE17EcfxtppLh0xIx56QhDhB4xwEnaVr2g=; 20:UD3viA2fxkx7lT6I/UOeEwLSgbxsbQV5Wl6Rr/Ha/CytlDwIq93/2NVbghS+7vuPWk5KXFaJieyeGxfb3v/boxFT0bYCJeYOXAlRppjE6XynIhuMYSS7F1ApRRbFB7R0P52ApHFt6eRh3WDbSzkBOr4udU07jmKIcmWjjhyFbsR9J6oom2C8fW7qArz3u+XUVbclqH020zpDdNex8lULheEQSzvTVmXxyQdauksUxPRbLsIhQzZLTjBA+zN0DldsZBPCQDWWjiTkjBowVdGqOkECMSTfliYYPZs2O18G7pmczWf3oAnneNOLQmFDeuaz+mUVWRPWoiYUrDP4r1FCcKPIthpqDP+jds65fEyCb3WVDrlYnqZaF03VujRV60T0/JmiZa6Qx99P5uQPBI48C43EOFd+Ok6gVxyERTuQVRqhmbCp6PQ4N/CrYVSvA9MO43bBJz7qBgLjv95aDHqk0ARIjGtJivxzHfDPvvNhPNJX/bohBTkUk6cJr/ZWDbXU 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)(3002001)(10201501046)(6055026); SRVR:PS1PR0601MB1450; BCL:0; PCL:0; RULEID:; SRVR:PS1PR0601MB1450; X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1450; 4:ypgV8oa3vtxflhnCfd6StKswxRjhWllANpaocZO6i9QWK1tctYcL92/YECSWYE0uL6nJ5ckKLh90FNkUeGYNVBJQofxYWbtDiVATy9Y/W0Ismb9w4SycnnGI0H/wj2bDTziO7w1GoMryylpmIKXC1IzVazYj2rI0bwzxy3yWz57wamt9krwPqlbATOTnktPLGqnrDXY9b0u9+ItD+l5sHo9zAZ/yUztRh3SdM6g1axCaB0c7s8UjO59GXiJrfZeasyKMMvcZ6lVgDrpEY0kdbmh8Y29Av5ZB7UB6Icghqzcr5w+5K5btGDvnINQavRxrRb3GQ4yhtBVF0JEk6kVzd58p6/iQMz5K14F/1p5Niy8oYAavp/D/LrZMjyMOR/7zZywIMefXyRnemOMarsNIBg== X-Forefront-PRVS: 00286C0CA6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(199003)(189002)(86362001)(53416004)(19580395003)(19580405001)(77096005)(229853001)(92566002)(66066001)(81156014)(81166006)(42186005)(101416001)(33646002)(54356999)(76176999)(106356001)(50986999)(46406003)(2906002)(69596002)(47776003)(83506001)(2950100001)(4326007)(50466002)(189998001)(105586002)(110136002)(8676002)(586003)(68736007)(36756003)(23726003)(305945005)(97736004)(4001350100001)(7846002)(3846002)(6116002)(7736002)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:PS1PR0601MB1450; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; PS1PR0601MB1450; 23:YcJcJIZi5Vot9oGYXQMcKySUJsgpmXL0tpSNYTc?= =?us-ascii?Q?3NdjzOSqKvf4BwE5NKJMdfw4w2S2BX43ti6YHBdZdaWwffSsedfw6mulXEe2?= =?us-ascii?Q?GZ4RMlp/UJCAdMKPdIQyXdrP+YW/AQo5TvGo0OUqEr5OgN/Y2mqTpOn5KgbQ?= =?us-ascii?Q?wT9m8TLGdlZJYMsnH49aVKyhPrmbClfpJMCnSrXX994QlMytR2B2NM26T4Ow?= =?us-ascii?Q?jOcLFRJIYDaI9yljongb1+q+p88FPxFZTa1bJaIvmAtrnn5Y0GL+usoPMYps?= =?us-ascii?Q?0uyFv9nLVLSUMYOp9CHRBAh6z1TknD6P/fYCmTEfcOUZY1PYCB0nE2wuuxmj?= =?us-ascii?Q?wgUjjuqOcubVYpSD4FcQ7mi26qwuW+m1D1elJAeDnqHnHgxYiwoIDgGS91cZ?= =?us-ascii?Q?rhrzWG+GYwe7Qn8gx1WjpWsSupIn2Baj1ukK7QMhVGPtPl+XkCR/4JQMI5Hr?= =?us-ascii?Q?Jd1FpDbejmnBvTPupnpacy0pEnCeZwUROota70U8sLQBXwZli5YKqTuvdS2b?= =?us-ascii?Q?V8iwGLZ3qAKYEhQAqv8zbfKpbJuNkcJtf1jfadl5120NxS/M3ou1j4mQdsdW?= =?us-ascii?Q?f5YCmObZx1qHRwTENyu0HpFbT6Q/GX5TJ89VZLTf0BTUqkcX6eUljRnurM1g?= =?us-ascii?Q?OXNSZ4vmI0PqoR+gTeYE3cbo3MuGolpT890kk0ki3MSKyT4eRyvsQjfxVYev?= =?us-ascii?Q?eRlYFizCLTGWqXlF2ckGoOESbOGQ3pjb6FvUAkyJJGBaLMKl2MBBFP3zMz1s?= =?us-ascii?Q?FKyMnMGia7SbssqZH7yz0EzgfzddFigu0cNCNVuFxBa0/NrNkuXsH9YLv+mv?= =?us-ascii?Q?HwnkHkiJaEgUT0ujEmunQACIbvbS6H59Xk/g5jDCaqvqBQ1tdEu9NbJJc3fy?= =?us-ascii?Q?Fwif264ZoTWASaCyuJO+qkLPpA5myQ2q/YFhHYtQHleuNk6VvCPjjJ6S5N2i?= =?us-ascii?Q?cdlDMewpNhqUJpG+M6kn3wDn70b8aqCe3WGxWUQueCKqP2+ER+hnomg4nlfs?= =?us-ascii?Q?v6SOdu1yNGdNXZdtrjMkrYxk7A6YQoBDrhq5hg0JoYqDGGFAB1X8rRmehXTv?= =?us-ascii?Q?4TIbj1s++pxRM1vndpd0t8blMjzLi7uxGLzLW2MMmSsvTNX1AoTsAX9zeHhS?= =?us-ascii?Q?RoR1k1bzL4XaekzWzZZ4X+cM9fHjTTiWpgm3rlBWYsnk7NXhiw+JZZw=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1450; 6:MC+/J7SyyTEok8DdGN2Sn4O37hSJwm3125QjtPI9p9Z0K965abkjJ7jnPkTucXv3AXZZQI58Szl9oAWmuwy6QA52PTIIYro1TbrqFgnrKMp2VkKv/vhymmGmRqgkPUPF7QobFin5vCTKy7xTe3UXH2DShtxU+UB8WAxh0PDBADquMV3hcMwEpSPfKxK1iIBrY2Pu1ds44ZL9c8t1vyVidw1TFWwI/4faypISnmkrvKHo8d6EeezzV7JrFeERSC96ccRYqcql+vazmFY239eAjmO5GBVgpW/0WYAzYb9oFvLrxMHMTW+SNozd3h1jxwooKeNY3SQ8zvv9ZTlRwWBAFg==; 5:lY92VvXOJM4CYXg12JAbZMOhpbHuUb1Vkjy20Qcl2n97b1+3ZH+uvKRwYDL9luCssKCRe5uK34zIPjXJt/0me/wyyJXjIu56Ojp6t10EbV77ieH0vzwU8IRyx+UXvfhr/J01NnXgY63/kZBuMXPy8A==; 24:oJkbZUvPR9443ShhmN68s5GAKa6EEkWjMeD5eJ83hqAnFraYjtnhJjn6xxiCAMQ/X7jN2PB9FMZvDeEzfV0JXJCQKJ70gxUmU8e7Vbopifc=; 7:sA28fmnF+iDq/Zx2H+sqm7III8zNGZ254RIk2L6XmDuQotWv7gUkRXIhc8CAKOdBMDvkLofB25IA8pTf2WFHPbJjuxfujqo/YvsU9D3WSQ2qAOjQQrWh4DzJXDoJZT9oT685wlbyeZNrJa30QWLVU9PVDQaU7RwcBDeWDTERENcf3E/IRqCeTupyDUK1kskK2TwHqHEecbAaJqv2cjLh/CkSMjyYcegl4Zes10H1h3UHcfZHOM5ulKewxAnr7+WM SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1450; 20:P2aCPz6BKn6qgtiGj/2fF2GprNIq+X71FROgoJVDKKJpxPafGLZwbD+sk1T0gTTVPSJXDjAQbP0AyljAQvhFnXzhIQMsJju9yaGgERMPAYlcprlY4Pj3b7/sX9sLvN/ZfN9jk0xby2dNLYkQqLkX5gwNRZ9UqsUlN89Gfz8mmLk= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2016 09:14:53.1764 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: PS1PR0601MB1450 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/da7213.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/sound/soc/codecs/da7213.c b/sound/soc/codecs/da7213.c index 095fe40..12da558 100644 --- a/sound/soc/codecs/da7213.c +++ b/sound/soc/codecs/da7213.c @@ -1778,13 +1778,14 @@ static struct snd_soc_codec_driver soc_codec_dev_da7213 = { .probe = da7213_probe, .set_bias_level = da7213_set_bias_level, - .controls = da7213_snd_controls, - .num_controls = ARRAY_SIZE(da7213_snd_controls), - - .dapm_widgets = da7213_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(da7213_dapm_widgets), - .dapm_routes = da7213_audio_map, - .num_dapm_routes = ARRAY_SIZE(da7213_audio_map), + .component_driver = { + .controls = da7213_snd_controls, + .num_controls = ARRAY_SIZE(da7213_snd_controls), + .dapm_widgets = da7213_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(da7213_dapm_widgets), + .dapm_routes = da7213_audio_map, + .num_dapm_routes = ARRAY_SIZE(da7213_audio_map), + }, }; static const struct regmap_config da7213_regmap_config = {