From patchwork Mon Aug 8 09:17:38 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9267281 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 B8B0E60871 for ; Mon, 8 Aug 2016 09:17:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A97E0212D9 for ; Mon, 8 Aug 2016 09:17:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9E39B27D64; Mon, 8 Aug 2016 09:17:44 +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 2345C27D5D for ; Mon, 8 Aug 2016 09:17:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752044AbcHHJRn (ORCPT ); Mon, 8 Aug 2016 05:17:43 -0400 Received: from relmlor1.renesas.com ([210.160.252.171]:39368 "EHLO relmlie4.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752020AbcHHJRn (ORCPT ); Mon, 8 Aug 2016 05:17:43 -0400 Received: from unknown (HELO relmlir1.idc.renesas.com) ([10.200.68.151]) by relmlie4.idc.renesas.com with ESMTP; 08 Aug 2016 18:17:41 +0900 Received: from relmlac4.idc.renesas.com (relmlac4.idc.renesas.com [10.200.69.24]) by relmlir1.idc.renesas.com (Postfix) with ESMTP id A8C4C51204; Mon, 8 Aug 2016 18:17:41 +0900 (JST) Received: by relmlac4.idc.renesas.com (Postfix, from userid 0) id A4871480A4; Mon, 8 Aug 2016 18:17:41 +0900 (JST) Received: from relmlac4.idc.renesas.com (localhost [127.0.0.1]) by relmlac4.idc.renesas.com (Postfix) with ESMTP id 9DD8348014; Mon, 8 Aug 2016 18:17:41 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac4.idc.renesas.com with ESMTP id UAQ12367; Mon, 8 Aug 2016 18:17:41 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'208";a="217447215" Received: from mail-hk2apc01lp0210.outbound.protection.outlook.com (HELO APC01-HK2-obe.outbound.protection.outlook.com) ([65.55.88.210]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA; 08 Aug 2016 18:17:40 +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=OfekA9qpGGVDS1H+G0S90rngHi7IWhzYs4CbR/FP7eU=; b=lHRINqUsZeCZbSo49K+Wxb17T0kKeud+nHqqvJVZNYN7f9Ef3qDN7PCXnuSIOK6yBrGcTfUaqJHagpbkRLmlkpHRBhIPBi2vrTZexuigHbdSx1ItQmF6rGyUXj+ixL4Mmt7sA7DdyuRaC3tB2AeiT6e7JwUF3gLO9l84aoX1/9s= 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 PS1PR0601MB1451.apcprd06.prod.outlook.com (10.165.210.155) 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:17:38 +0000 Message-ID: <871t1z4of9.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 097/159] ASoC: codec duplicated callback function goes to component on lm49453 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:17:38 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: TY1PR01CA0044.jpnprd01.prod.outlook.com (10.164.162.154) To PS1PR0601MB1451.apcprd06.prod.outlook.com (10.165.210.155) X-MS-Office365-Filtering-Correlation-Id: 0a3ce370-47fb-4bd8-d814-08d3bf6cd79a X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1451; 2:FxUgYYutObW/AzLLsJ0wLOzwS44u3XmWHETU7TexomN1Ozpkv/xGDxODatKSV9k5sahx8fV6N9cinsV5KPx1iKTEhCYo+IGiPJJTJE/txuo1GyBsxav2s7KLDSYXeq5J6iJBEc0KbW/CjLTi+RlzLmTI2Tb454LfHkJ7pgLQVO5hjRuqTWaU87u3V89CFXs/; 3:MlJawKb/iUQJ4vxC8D0wosWJroffQsLZ8aPS+QdIePoZ0IdW8xPti+wLyLVnVq6jA4TAQDyHaO76ZzVeBMzUfaSVnNoFblceFwHD8lQ2vYiH6VYw8oE8Y1EQFa8GzN4U; 25:OO57W0TlpVV7CPQ5BMKOz58h68G+DQNpsgPNCbFo/3kr0ZvhrYeJ5iQqvejpNcT9yB5JctRQhes6oIaMCvrTU0nK6JITMvKQ043v3Zb0fb0Uqp41grZeQSAiDHmbR5EwOF5jalqk8VXfF6N8Nq2XAra9uHET87aqcyvCbtR3OnvKOhZ4Eo8utTpVvJq3cXGAGK7Hcza8xXlMN97795+/PhTP2pxMMRaJXeT4dWlUDRaMjuRM4lLHD55bRRIwIfW8fEd/MbkDf7Vmzk0knHHFKkWuhmV5rpsH1XU2tPEo89ERKmnU84Ah5Zpy4zcb4H96kQWKvlB3/wgchp3HyjE8PvhRUuyGOKR7rftKwhUp9KOx0vO+mDZOKZguuZGYbs/4M7mWhh0V3AlRbjFnk3mF1ajraI9pAvkDpQSl0DfC6nM= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:PS1PR0601MB1451; X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1451; 31:Ol5p7gxW+Fg2YMpOwg1W131WjBXaGuOKvFc9i2OCG0XoVzoYN0Va6uOqA9IGE0eJMZPHfNnH6EBeJPYdKAbyIF480PlS8qvuLQ03T2TQiME9+0WwU+Wr8D22HPKCd3oZbOn1BXMs2xJ7NNUCBDTDtvtKW3fBH9GGg15IfM8/5zz7bQomRbqSOaFHIbN+GbHgkW1cYGbSnBMmV5T9wtQm2B5H0YkZUIDC6B+PdRxZs+4=; 20:BzxbXArEGy9+KjUCEJWTXURm0RJ0lr58w4AsK6fAmQGx52Xp78kqlYXUyaUGpksi+z7C7R4jSM96RxJf/NHacSlNQ6jowg5M7/BNtCPlCHu8Nl852ZDN3Ykmus4qBTXuP2a/3YX54r3eC6qtaRH/ltS4iut+CoJMHuvMBjzJhEOUBeqNl+d6JmRd0mKxBLXXMfXOObFlyRT0lQhNxM21DIh4cufUca3rSDo45ylZulsXMs0L7OoKYk2PpkddbRsnsIt2RKyaNvya0+yfiKKU57jS/4YRzNnmhX6mxNyKeCq9+/0Jxd3AWD+DVwS3HD/oFCSeiH0kLekQiZ9M0JIKVVtWapwQowFFg0gatJUjm0YIPxX2TVp2FCql70us92/XHUP/Hu3E6GSbaZXoMTxIbApyIUMOjlxcvvsfZ/6YRSF6XXd+g5ElXMVcxLCJ1KWdSfDvf5SKpIKGaqOYCBlmfuJWOKTfyPtA9L4eBxHVJuNsHBHk3YG99GJd3AAlea6p 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:PS1PR0601MB1451; BCL:0; PCL:0; RULEID:; SRVR:PS1PR0601MB1451; X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1451; 4:blmJZiB4tBcG7OCMSM60bplqyZjQOxqR6i6tZPoHTqk320nAvGs8xj3CTHLH5ZaC+dje/1GCIgMq2Mg9cr1hs4+TFWK+kcbFOzz9EiWQEC00/dK54fd1mPRytZ5sUNmeGyXitRrRas7kjk4xwcgZ8Eiiqy0okSGM8RwWbK6Co5R76g69yKepUfHhVCDeQEAiTqY1qIxw4SH6IZKbl9CZkYKEtRlZ52Yh90o1OaRBfdBBGR7IpK1qR2UszlmNbBpY45IwDsq6CGmLvl2fA+/mqIs8Q5FJUSjIbUQqtYroa0zmVD4lYmOEnPaSk7iEX8u/slbHviFH18HUq+ZqZUuOl8z5QhrAzrmOrN0CXtvBa8oF2pAlB/V03wqzqZt3UKfE59/5b7FPGT88TzAPmlRbrA== X-Forefront-PRVS: 00286C0CA6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(199003)(189002)(229853001)(3846002)(50466002)(6116002)(53416004)(92566002)(19580395003)(77096005)(8676002)(68736007)(46406003)(81166006)(36756003)(2906002)(105586002)(19580405001)(69596002)(4001350100001)(81156014)(83506001)(23726003)(106356001)(2950100001)(54356999)(586003)(47776003)(97736004)(33646002)(7736002)(42186005)(305945005)(4326007)(7846002)(101416001)(86362001)(66066001)(76176999)(110136002)(50986999)(189998001)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:PS1PR0601MB1451; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; PS1PR0601MB1451; 23:a4OlPKF6ggcUtY4DCKUBFFYDnh5efIvdPcVVcJX?= =?us-ascii?Q?mu68RwkEtA9W0pOA1slsTRsW+AyEs+PzQxgRGt0oCdEonHTKZly2xTpmtD0b?= =?us-ascii?Q?IwihhHoblXjoa97fqUMQgvKrLGX//k7QI/MVe6aRq+4Ff0RDH2ArMcbAOBtU?= =?us-ascii?Q?grkuFDYwqWmc8yCYdzQWlFckEVVadwwH0rBzZolnthMAUr+eStkCvVRidts/?= =?us-ascii?Q?fChx2P3AktEyYVdyCFAfdomdn5Iqft61ob0vKggnvoSB0uxKRRTrtuse0tAN?= =?us-ascii?Q?eidRvWNy1s+EYHob49KxXdVh2hnLLTA671q4kRJtradUl8kcnlA7GeMwFRgs?= =?us-ascii?Q?cJyvUEl+rFNHRMemBmY76xdtW/rBOTwCmjsjYA2KjmXMUrcumvd9W1KZt+DK?= =?us-ascii?Q?N7CcYabcqVf410ztv1S89F9MsrfIFzzZdDU78gpYv03G0MWK4DDgtRApZzOi?= =?us-ascii?Q?7yYP9X+oLaaKRi3lsSiQqEWpAEpun0FKhVr2cEj2MUYQ13QuNWFNSB6xmj7X?= =?us-ascii?Q?IVP9K5rwfrQIDJXEX4hPYapcIK1kXyUMEwPUlyzQs+xibT24/HosA1g2htyW?= =?us-ascii?Q?5Fk09QAKDM+SDlTQz57hpetaE5Ur1/Rrx0Cv7shiCkoLHd5wMQR5NlcR0bKo?= =?us-ascii?Q?2ZBKe94a2RIrLlmfsNgsDCk01rpB0Tkbzrn4VRTr3ohencczYC4ngXYPf2e/?= =?us-ascii?Q?qf2PoZ09OBF03m60J6nK9El/7kqOIvWmhrsyhC3i5O1IagAmsMydj64QUXV0?= =?us-ascii?Q?cjLod1KyVPXINlPHUdMdSrzljBaeaoS9CA3XYXBAmr7V84vM7sZ/2v5ANZoU?= =?us-ascii?Q?o+ZP58FW5NF3WOcu7eiey+YJSDe2LthHX7kDwWjykPhJ1WEUBKx8zoeMTIwf?= =?us-ascii?Q?DOZD1FpXwsXLP4mRyaqtXFPcdN/mAcChUfp31WPmglrGic5ieDYBb+Hsj/dw?= =?us-ascii?Q?vMdizK+614Z/NPVSzjby4Ir2eCHhxyWKM5tHweu7UjXa6/932jaHDvDfWRqo?= =?us-ascii?Q?aDPZad/GIjRvM+Rnc1OuRWBJDlO6eiR3Th3qDPa+AZlfIiWf4WBRR3chljw0?= =?us-ascii?Q?0BJBqykdldXiuTs6mFEMogriqoQxJ43A2fOxA7xEARbjdaWCxVY7fgq5mC/y?= =?us-ascii?Q?YOigAvdcDttOj0bcGvkHB1OC0UCoNwkW2xmhOIJGvrlkIqu1JOR/wsw=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1451; 6:9P9jEJYHL7Xc/XDaB64OKbNzfZ79frG7q/TSQR3xEqZux61pXdn8lCrO7ctTzgOgPjV4XQ5ThqUBWbA/Wp9OOv4mgqfBEhDJ+PPzQZh/kS779MO6FapdA+/RRsziDMU3Y1eB/s+E+Cb0BBKFaK+rHGJTtmJPC6FGwmz7Z6bQCByacA5XwUBPBD5td2BdPS9yhdMBU99MO18eS66mR5a0Y4fl5PublD2IrOl37AZHWNrabVpK8nUltkUNwTmsb10pYmC8CarJQzk0a5RLNs33wlSTsCps6A1XIM00ONpHQx4yyeS1IozqA+sEqb43whhYn+WhvLH5STbDjAGJGvct7A==; 5:gkgXnpErTWzI+l5ijgsjtUp0/7VZisjidwNbBt7O/+DPkVklo3jVSOE4YI3bVe04Yg1a4nt0SL85IxqvRkWfP94cnMNoeHwNMoFGYdH45t/wJYloFds/wZkp+ceUYh0S80cNRoLwJ1RpCae8VYotEA==; 24:iwTqSJ72J65jUaek669rJ08zkPx1Xkf/Wbl8CYuVIfC73G/aGQG05JuprKOWbyVnt79gmuEKBB8rwhsXtY+V66cTERN2YHLLrd0klDANPlE=; 7:U5D4TOh7auwSc0XbAmb84VGA1gP9T0uGhHvhVCERQCD6+fQH2m2KYxZzKWI4F9h8UvzJhlt+b834/otFH0fEfbZCsd5KCACp3E6gUYFUaqYUROx5ZWSmLaqBbtaEf3aEIsrxOAETROS1fVYBtN8DRKCO2ymyfP9kxF4lQxLNSInvsuSmCnfomhqRVg5FtNlHQF0fUr2lvHCISm0fKpf/GtQRLpieSnKPkUpqUPYm4PNUwLSdOeuBXm+1m24L4pjd SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1451; 20:3mnEJxSo701vUh4oMdbXEvo5s3OGYDWi9sKWhw6yYgPAd77hMDdTxCkOk3HG4rFHFCLVxX3iSntJNLzsXvdbrR5AyaRYjtr04+g5jRItUq4XXxQpD9i5dAFJitnbQhyamisyd7KIlRwPNxGva04Al0IsYpfSO6zEHyAqdvxJYpg= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2016 09:17:38.0331 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: PS1PR0601MB1451 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/lm49453.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/lm49453.c b/sound/soc/codecs/lm49453.c index 9af5640..8d413c2 100644 --- a/sound/soc/codecs/lm49453.c +++ b/sound/soc/codecs/lm49453.c @@ -1391,12 +1391,14 @@ static struct snd_soc_dai_driver lm49453_dai[] = { static struct snd_soc_codec_driver soc_codec_dev_lm49453 = { .set_bias_level = lm49453_set_bias_level, - .controls = lm49453_snd_controls, - .num_controls = ARRAY_SIZE(lm49453_snd_controls), - .dapm_widgets = lm49453_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(lm49453_dapm_widgets), - .dapm_routes = lm49453_audio_map, - .num_dapm_routes = ARRAY_SIZE(lm49453_audio_map), + .component_driver = { + .controls = lm49453_snd_controls, + .num_controls = ARRAY_SIZE(lm49453_snd_controls), + .dapm_widgets = lm49453_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(lm49453_dapm_widgets), + .dapm_routes = lm49453_audio_map, + .num_dapm_routes = ARRAY_SIZE(lm49453_audio_map), + }, .idle_bias_off = true, };