From patchwork Mon Aug 8 09:24:06 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9267379 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 68394607D6 for ; Mon, 8 Aug 2016 09:24:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 574C126220 for ; Mon, 8 Aug 2016 09:24:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4986527D64; Mon, 8 Aug 2016 09:24:13 +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 D07EF26220 for ; Mon, 8 Aug 2016 09:24:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751951AbcHHJYM (ORCPT ); Mon, 8 Aug 2016 05:24:12 -0400 Received: from relmlor3.renesas.com ([210.160.252.173]:60767 "EHLO relmlie2.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751259AbcHHJYL (ORCPT ); Mon, 8 Aug 2016 05:24:11 -0400 Received: from unknown (HELO relmlir3.idc.renesas.com) ([10.200.68.153]) by relmlie2.idc.renesas.com with ESMTP; 08 Aug 2016 18:24:09 +0900 Received: from relmlac3.idc.renesas.com (relmlac3.idc.renesas.com [10.200.69.23]) by relmlir3.idc.renesas.com (Postfix) with ESMTP id A226352529; Mon, 8 Aug 2016 18:24:09 +0900 (JST) Received: by relmlac3.idc.renesas.com (Postfix, from userid 0) id 96D6B1806F; Mon, 8 Aug 2016 18:24:09 +0900 (JST) Received: from relmlac3.idc.renesas.com (localhost [127.0.0.1]) by relmlac3.idc.renesas.com (Postfix) with ESMTP id 8905E1800A; Mon, 8 Aug 2016 18:24:09 +0900 (JST) Received: from relmlii1.idc.renesas.com [10.200.68.65] by relmlac3.idc.renesas.com with ESMTP id UAA26456; Mon, 8 Aug 2016 18:24:09 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'";a="216937812" Received: from mail-sg2apc01lp0242.outbound.protection.outlook.com (HELO APC01-SG2-obe.outbound.protection.outlook.com) ([65.55.88.242]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA; 08 Aug 2016 18:24:08 +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=J0Q5r7nH9+qxuNpVx+A4DDITnTG/hun16jWws0VWsJ8=; b=kBmy7HZfrX3DecVc5K08YEfi/pGOH+7d9xUv/zC2hKIC6p6raF+UJnJF8ZempCb4cHmcsGzk+nml6tNDC83veu5Q4tbuen8/4CyqCTmG5ELN+cCmrj6tG94nKoVqIVy/0iXKEtoBbMpvnt78it0BYw4WRnGoZ6bjRWSxt+c8f6A= 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:24:06 +0000 Message-ID: <877fbr39k2.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 118/159] ASoC: codec duplicated callback function goes to component on si476x 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:24:06 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: TY1PR01CA0096.jpnprd01.prod.outlook.com (10.167.154.14) To SG2PR0601MB1453.apcprd06.prod.outlook.com (10.169.106.19) X-MS-Office365-Filtering-Correlation-Id: 9b98bcce-a8b0-4201-6392-08d3bf6dbf0f X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1453; 2:7s1AI0l6aRChz0QXptvKhnkH/cNd03UmD6g7yQsNrvzXogH+KnRXgI8OSKdfBX8VRB3VoJ2U1L6ZN6leNZtkif0VO71ciSKpPLG2tPhocgxbs5Y848jnpz8bjW4UcopBmiOkRfovo92BStcMZG4womb0Yv5DROa2SIy76AYmuQGpWTC9bT634NCsvLj49rhC; 3:NyW6YYOWjX9HuQS6a3CCymru1DyfBklJZf6gDb8cJOU3l6eY5levGuirwH/uLpof0XzxUj+A7NCehj4pbG6NfLj7GYkvczxGYbK65Ka/6kfyoAEi8OBrlVDDfL+b5lf6 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SG2PR0601MB1453; X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1453; 25:ycJ1J0XKVuhNQLN0FEsCsSd5gwN6lc6iVitCwqsbsC+PHJHPyy3btwoLq9EQzyMELL3jy/RBjjjFW/RQR8ne6k+0iVhPfYiKKUx88fgqj6VqfMLNpmXw1IMrGfwNv93xVJqAX/Tw1g3mRvKy//ZkWA7MtF2j1a/WHQunSEwkeaePoRPfz6hDPAfhZq1nQiUjGsvxRRUdnMDV13e60OJ3RNUb8Me+A+EBP5RddWcZV2opUXeVpIQ+u2kPB/p7xP9wwC8fWkZLg51Z9jsjNAm4HZ/rGRSBI/FHtycYJQummtKaMY4HljOKeVsHEpHSATbJeMBumEaPjLG8qgjzmmdcgI9R6/z2NbS6UPgtf24AEgo6IXeUEVKRdb+tAaboF9yQU0VLPl5iR2JVjtEJ7kgYFOV5YMgH2FScSVQ6UDS5NgLqU1c9IbYkwQqWMj9mOy3jAQ1LRvDau0ZSriobowbgO3Y4QhbuFnupWq+C86xpXL/3xCCiOvwSLaCnhTJAT3a/4fcJ5rKFQjWPluEIZP/n/owrkS1A064vYlZhY9MrClv4q3QGexoPMzVSc+hY4KQ9yNKbSbChFZ9/A4URQ6draNEdZf4/HSS0U6BbOueAIKeaVkYgfdztmHTqTQGSdzvyoic7PKOGSro0hxK59dNTc0pdd74/xqp+1Tod3s8HGV4qBG/W8yxNt4pFEarrwBy9; 31:dcPzOQKrqqsceMxC2srSS6FNp2daz/aUqJWsjItUk2APnj/8cr7XD+YnCen27LD63r5pgdU7aYgGagJsHpQRzDbAYMo8JRXGjTe+y194DSOBrF2oj+MWsg0TRLZUaO06KRouD7/hRdjSS8hxqvPAdMYFNHB7KH71kvp0jPl1BHhLrJUEbsrOcxiW4dG6kVd4hWj3Izev3/mOWEiN1Uo05uPsnVCLaaM9T1i uPuh7/1o= X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1453; 20:6PAaxOdVzfdc/hj9pcVfghlNpHagUKJqN9oJ/UKooQUWc9hlg5jBX9hr6dzyqRmwjzldrNrxmwU0CoGMS4WmblbrhDPcjJrYVEFipjOOIaZj824lotxZcpx4urZ78lr0XIGD4frkrVUO+ow1YnrT4+8ldqhh0VH/KPUQ1Mh2I6BLka9VBNoXYLt4RbtJl9RJARBbAu9f/LVlJvKjbujwbKdg8isS/0lIf2rTcBYAeeFC+MjPp2UW17rKDL1q5MNQFe6SZRO9fwoPTNFPP9/hbtLG/0fzZXGZoXUoWgRa9PHMZrd30nBcMCU5znMWDWlHf42Q9jCfYLAidMdrWvQPK0Cob+TfGTc0U7N26HfqLVrBvPQ4ypbVxLJs+Dt5IiUJP+5I3lD+GEtuDbxzA2MeFoffDcFrPbRqaIp4sEWFCiw0UfLYacuonHJ+HDrmhtGO+XcbjUy/Ki2ASJjHXnZIr9DFvKiQv5mNDm+1sJxAin3iG15O/8knx13h4JR1zjEs; 4:wRcV38FUbuisnOui0M4HZAmwfMSTcCcMfo6lEwbJXSy1OGlCp+Zl5IUADPq+fQmf2bMHG5IMNO+JxImkIcLg473IW56/gTytcNyajqfcYz6mYMlITnhGRRKcHWbAi5Gl/3JAk3m40GcBkdotMTCzheM4KxJJT6GJ5U4TQiEbej9EsqtAzB43VxXBwOxBoK2zlLImMBD0ZoaGXCAbuC0duTHYpG4mX55DcCwWjpEE1mF2qabLGZIq7+wHvXK8Onwwg2e6QB2aimx+U/jnCAHQq/Uzj0WR7x1bOJfODj86p/rHVGkCs6HUfjk3HB0G6PmDOUqKc5ue36H9yyqqmEvDdu/15wmdP/UediXnTSt2go5drksh9IoIlw8OeVG17QRvh8UU+PDNgHWBgp0igUUvpQ== 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:8OB9UXIAV0i4Ls8CzRdMzERPHUDHwYHICj5UNah?= =?us-ascii?Q?DjnQIyz+QmvFJmvqIoyA5HYYG7CwSsZzcL6awuBFSvE+IpKgJvnSv0ppmbGD?= =?us-ascii?Q?IJhAUf0ndHeurFtBmDQQy4crOrZZ3O0ZJtt/5tkSqk/4cPzTq2yrMR9qlzp6?= =?us-ascii?Q?rRkNcsVQA7ylmEgMXaa+Nk4NnGSqcWfI5FjYu/PqPlpUxc155hZuJA0H/6tQ?= =?us-ascii?Q?SXKZlA64LygsTfvwenRQBAGDdhFKCFkivJJZCw0JHp3KYW6SW0/oURsn+qqy?= =?us-ascii?Q?6re39CTOtsTFcQENFCybNtjFo7j4seL2AlfiY0j7Arc7CtZw0cgqubpXAniv?= =?us-ascii?Q?u3aoac1O6XPlV4zxxYZa52tsB5dqU/Hu2wlzv864PJCTf5he8+haKL+R6FV2?= =?us-ascii?Q?TKZuDpG1ND8YXS4nTRksKDLOm4iFVAaZlO8OYfy6MHlST27hpi3dYelyQVR+?= =?us-ascii?Q?eW4V0lTuVR/yZpncxzxvlRyZgqWreYtTTEOHZdkqQgePnH3nL0ySStRML0bB?= =?us-ascii?Q?c1MxbNEoTrQMYDVSXy1ZTDh1xf3z3rn4V7My0kFSByHaCRS7nBsQXILFMquH?= =?us-ascii?Q?Au7ZlGX4gmq/M+fUUqrnbk5ZxL96xHLPMtW/bDwV8V3rkF4rqTen79nzFZh3?= =?us-ascii?Q?xodP5hqklogbWJazWv25SOdE2Pk2FdnKGJHIsHjOCN7xsWy/9Xw6UorNxyb5?= =?us-ascii?Q?eaF2FFyt+wEekQkJ6Uc3ax9dGhfyFWTG7Cwfac4PTieDaaHR2ta75aJdEvGJ?= =?us-ascii?Q?3pPkM1+HaMGwHiIyfzlhLjbCvmqMl8dI2rl0srR1L6ESwU0xIpY65eOItSiT?= =?us-ascii?Q?RtMu7pGCJPCzKRt87t1aSmz/Ssx0dRd3dRF2MeMZxrg3e73+vU/KS3OIaGOW?= =?us-ascii?Q?eR3Bo0Cb5eAA/I5OfOFEu4alYGsIl6vtv3uDLcdJjEF0la3oRkKuXOI5e9tU?= =?us-ascii?Q?kEw1RbcrJD5CvOnPN166/jWYapD/D1xx5d1qocYpTA9SB70x7d4wR63wjK55?= =?us-ascii?Q?DQA5VxqYY0Z4crhQnU5chY1JLs2xCd4Nk1+9+8I0FwRHY/nZN9FUe3FkFmAp?= =?us-ascii?Q?GGSEZPSo1hweGKCbqCiu0j/l+k7QABivsIDqTWKE7lSmpdAsIGG5p6w3BHgi?= =?us-ascii?Q?O83nHZYe0snq5NaWnfDdKpuCk92KWOTrtmv81Q17QKfxZnQ+8+l4FQg=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1453; 6:d+Cj878Ik5r5diM/JLTlplGk55ZFj2PhPcTSrOOdyvHc57Fpn8jTXiB/U8VUV50MGINVW5D6jSo87+0mWa3HUwUcqDG6ddxdIODSLQCqXJziaBnA+WFrLoL7O/7KEmH/B90wRhmcdUaASTqWc0yZbaEBjK2M6xyjzr9aOC8s4qmc71ynRpf8XsbRIQ/7UQx/bZTBbKrUJCO8rl14YBLqxmK+uxpb//bRlimg2XIEwzk8ajOggGS+Dp+Nxd+W1olHGQX3WG/YvPWCYUgbmWcoYBoe5/GYQc/7/Z3V1jF01nZSEFQJ1iLYPKYrs89eqeO0VHSMtI9X0WAeoYVEaLFCLg==; 5:jDFku3XcpFSJhcLQncAlN1u25L3mVcFmso3xbI9U0MWLlJC13gG+2iUONUggL7RTNMfWkjQ47nRhoyD9DwxSRnQJG4KNsBcncjsYa/DGZQHl7VNYGMqZFft73Tt5g8z/NOBEGdQ+5z2jhfH5zRrdFA==; 24:cEXmGEPaaHmNbE9TWBWz5JoXyjLJohkcM+Z3WwUC7jFraxtKMS5u5otggCNPCXqxc5I5uBh6IdhU9TnAg4pIehDDOYAWPx4J3pcb+OVsYF8=; 7:/V20VWu1Ufz19y4mpiC377DyuaK5PUeykARXxug810MYIav10uCzBQe3gbF8+PSu8EnxNtB9sJIVN+ckrm8H5FcikXAEuNR5HIgvJmEFvl4tjkcfpyhkyA2dRxno7M2mniAqgBTAgtUmHivLjJylLwoRrcWhYCMTwaG+e9KZUA2K/0LfaCDUOkMBP+M6MVOzH/GYJXk4oIOEpS7xeNlxnxQ3SgbpJyamjxkjQMwdjj5n/+jYZa1Jm7RfU/LyB0oJ SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1453; 20:3bky/x6u43u+MvZBeABDwLrwW1sASVzL96Y+A+w+r10v6CqfS4wC8+hzA55SlOD4yADnRaVwJea0RUocYv2RHXz3Fy258oWVSBBRWfHAZrw1Zn21oMpCkRk/gtCN+VqNGZ9xlt2YvLJOJFRLgcMI9EL9VKzWhMKqjJQwzbOuzyo= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2016 09:24:06.1564 (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/si476x.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sound/soc/codecs/si476x.c b/sound/soc/codecs/si476x.c index a8402d0..5344f4a 100644 --- a/sound/soc/codecs/si476x.c +++ b/sound/soc/codecs/si476x.c @@ -238,10 +238,12 @@ static struct regmap *si476x_get_regmap(struct device *dev) static struct snd_soc_codec_driver soc_codec_dev_si476x = { .get_regmap = si476x_get_regmap, - .dapm_widgets = si476x_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(si476x_dapm_widgets), - .dapm_routes = si476x_dapm_routes, - .num_dapm_routes = ARRAY_SIZE(si476x_dapm_routes), + .component_driver = { + .dapm_widgets = si476x_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(si476x_dapm_widgets), + .dapm_routes = si476x_dapm_routes, + .num_dapm_routes = ARRAY_SIZE(si476x_dapm_routes), + }, }; static int si476x_platform_probe(struct platform_device *pdev)