From patchwork Mon Aug 8 09:31:25 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9267485 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 D3CE1607D6 for ; Mon, 8 Aug 2016 09:31:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C378725223 for ; Mon, 8 Aug 2016 09:31:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B827C26D17; Mon, 8 Aug 2016 09:31:33 +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 9AED625223 for ; Mon, 8 Aug 2016 09:31:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752325AbcHHJbb (ORCPT ); Mon, 8 Aug 2016 05:31:31 -0400 Received: from relmlor1.renesas.com ([210.160.252.171]:24637 "EHLO relmlie4.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752151AbcHHJba (ORCPT ); Mon, 8 Aug 2016 05:31:30 -0400 Received: from unknown (HELO relmlir1.idc.renesas.com) ([10.200.68.151]) by relmlie4.idc.renesas.com with ESMTP; 08 Aug 2016 18:31:29 +0900 Received: from relmlac2.idc.renesas.com (relmlac2.idc.renesas.com [10.200.69.22]) by relmlir1.idc.renesas.com (Postfix) with ESMTP id 310A651A85; Mon, 8 Aug 2016 18:31:29 +0900 (JST) Received: by relmlac2.idc.renesas.com (Postfix, from userid 0) id 22E232806E; Mon, 8 Aug 2016 18:31:29 +0900 (JST) Received: from relmlac2.idc.renesas.com (localhost [127.0.0.1]) by relmlac2.idc.renesas.com (Postfix) with ESMTP id 1D95B2806D; Mon, 8 Aug 2016 18:31:29 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac2.idc.renesas.com with ESMTP id UBG20980; Mon, 8 Aug 2016 18:31:29 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'";a="217448344" Received: from mail-sg2apc01lp0246.outbound.protection.outlook.com (HELO APC01-SG2-obe.outbound.protection.outlook.com) ([65.55.88.246]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA; 08 Aug 2016 18:31:28 +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=3NYMvS3KqITQLPAVad4NzLzgPRWWANUEXi0F7aKayi8=; b=CPKvScI2K7OCqsoKp94SOGsCzC6EfPMgGCmJ5BTo1N//TRhOJjma0ezqB9hIZVzR2EfeT67EY05jGNdRnV/9KXxejASU+WtQZ5MJ4EeI3wfZY2r0MLbXdZsUdeTAKnDnCniRuWeqvjMAS4n2rU+U0Ov6Os8KfP6qzjYZPeKQar0= 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 HK2PR0601MB1441.apcprd06.prod.outlook.com (10.165.182.147) 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:31:25 +0000 Message-ID: <878tw71und.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 142/159] ASoC: codec duplicated callback function goes to component on wm8900 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:31:25 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: OS1PR01CA0043.jpnprd01.prod.outlook.com (10.164.162.25) To HK2PR0601MB1441.apcprd06.prod.outlook.com (10.165.182.147) X-MS-Office365-Filtering-Correlation-Id: 09b57ecc-abcb-417a-0203-08d3bf6ec4d5 X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1441; 2:uInuDR5YM9Cwtnr5COH0kk+v0fMtt/mPDAg1QCAkUAsUuLFrO/FLwnZFndwDhT8/Vn0WjsAenKEwPccGB1CY9KmVocZXHspGLQFcCQOXrboP1W7tDjuEnq7V/BE2iP/xEeOYZ3AvpcZRv1KN6ePoA352aUW8MUpkh7VXJ+49v2yqIaXkYTMbSXocGDYjMTct; 3:hPGKAw4POCBLzPrhQGWx+XjlkfTdokLkYyl2SzbUyxHKLBLxVw6lrUk7oY0SdlepZDipVP/04LSttF0C1xIUFTd+fxzsgPxWLuB0nsz3PIKvTsAUZo+8+6xAOmssYC2h X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:HK2PR0601MB1441; X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1441; 25:zqUUVK6yMq/iPSJYbWIWJ1z2W3Ik1h8H7CNMlmAZ8w+pL+S5MBYsVcDDlakyApEGYJJd8TFTMdZLWeFRwfgS3yeP647oDm4a9sPSV8+RPcm49bzRfbMH2Rwn5FMiE/SspgQDMP1zDHpo14R6T/HKJkPGwirQIggTx/Vv0mg0oa+d9sMy4PK8TLFxS9MHRsjV4FuIFAJlANkV17JZAkiwlsUXIob9ZXaTjE739Dh/G4vryTNezRJfcm7UEld4Rn2hOKV9LSxiSKSwZiKIVG5BXIMehUgbpwvdOZ9bGYoCW4pr6BROZd9MsS9vyb/JPGCtMNBiBHMNozmAixkOy2vqg6zLduGgjDDUsW8N1fgs2BqkUZkqhWmjIgINtBtUFuCUJw0j94V1rJMROjl0cnrD85THRjhFUvR5pO+m/7UJttST6GkRiVd53T/0KZnEW/7YrOFJ0ahCim0afQgnjRIa/L5QRj3QikfsC3PW2GVLmi1OkhqUI74O4wzNpiSBYf3RI8YhuK+HxaA687YOAIaAWqF/+MXgGlUs9OuXR39gThY0Wp2s0suVZT1DIde1qRbc9Nz9TFGQ0M2d+amWvBS0oj4KFgEIm28t8EAFNIWWBL50CSSDQ/ptRd6k313aWenuDHtQSSU3c+N2T3NCo/77IM6/ui1ppWKLyvhSr7DztHZwB+l9XOQrtwf5IWoxgqfB; 31:dyG2mDQB0y3TWPKdh1v1iI1dl9+8PvGofYUXiUIylpXWD/iBu5WtO4n9AECNOPT6fJsVWUNbT+/z2kBn36TT8ZqyiXAWe/QtbHjHIlnLjLE+B/DZq/l3QEGckOOYSqU92kxS6SoNKFnjib/CosTf8fqz89BMMGS8k1nXINGKzMRhB6P4rhKQKbv/kKgqS9qfOpmcTCk/j2JiwwhJ0h4CITg5DOy1BewaPEL WFLy1sLM= X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1441; 20:85onOhCWhNmHTMxqfs/0BSpqTYHGmMBBxGdebFu2EaWYh0+ntxqHSWiQqYa5pF76hKnto6t8v/7Y+X5Dg5Yl5lgrnNedwcYq/UQjtMLYkIxJtZ1c/RwArEdPeGIwJZ5tuM0AlxRl7bhXwQzZ6blyIjj8HT/fQS94Ho+YQlIFikNqY0GsSHjwc7X2FgplP6CgYWXgZmHQmQJkRAdTi+Cfy2gsGVqmth1rjHBAw8lA/JKW2s5lUhgwRCdGCgPUZf7Xxa0xQ2qYR56uTFoP+HZLZSRPDGV/1Ikajfds9Fqztolzps0CmnAKbzLrE66gK/BxfZgHZHBButVFSBCE4u9UPKHG65oQanqIVIQdIh8i56M4EKUxnTXUzeuB9VBSyPbgaklwZ15W2CycSWKw1CgsVzbxMuBS9GmDKQpzlVgTsIfgKQzi32oFCOBhatQvHOO/MgqzfFC0ASUC4Tvfl6E97MfKAS32zPZLh9cLSzqv6/8OuyuStSmkKKYhokaTL/Lz; 4:B1yQjmByeekVKxuMxzO8xVUWmH5y+St47xBV5NdlALzNX5cFRg6MlC691xhQ/mY8NoDr+C0F90Xa9Deshbj4oHC4t7RhRFP8tjQ1oc/5whbS6YOmWinMLaLgOr0zfNDueCys7ZvV5hK+jc2lNAlP6TcbOd28mzMUvIwuDNpKbZ3gRDTlPd2Aw1VZLvagRdbkFYN+iG8O9irUG1ukiDvw11XTwMIhpEJyA1AlUHp2T88czAcAxLrGtGnUehe9f9Ng0RW1DtZ/IXEzOG/CYiYpNrVDVJ4mGZHtFA1zQuQ/ghCjs+Ysp8a3Vj6NeUquwdFugEHfuaIRtbLrZZf8bDqBCERIMp1/e4DuvBR9zipHdnUnjrbJD8BJFUzkWHOIlK71C2xtYbXDTgvMvfs1gAplCg== 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:HK2PR0601MB1441; BCL:0; PCL:0; RULEID:; SRVR:HK2PR0601MB1441; X-Forefront-PRVS: 00286C0CA6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(189002)(199003)(189998001)(54356999)(50986999)(105586002)(76176999)(50466002)(42186005)(7846002)(305945005)(4001350100001)(229853001)(97736004)(53416004)(110136002)(8676002)(83506001)(2950100001)(106356001)(77096005)(7736002)(66066001)(81166006)(19580405001)(81156014)(19580395003)(47776003)(69596002)(92566002)(586003)(86362001)(68736007)(2906002)(46406003)(33646002)(4326007)(101416001)(3846002)(36756003)(23726003)(6116002)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:HK2PR0601MB1441; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; HK2PR0601MB1441; 23:07mJ9B9mgjDYR/BEMZJLhX8t4437/A/+Z6X7+qn?= =?us-ascii?Q?w/imX4SH4gG7W9oJ09cgUa5En/eE4zKR9B/lOSvpyczaR+eQdjWGztz80hFY?= =?us-ascii?Q?dl3ES/gmGihtL+A3wGm01LB04LVY+4ktqit/z6eviE3unRP8G4YCGU8owpvg?= =?us-ascii?Q?MtNnxY7dud1cZ6PCoIg3lQruPRQjsgc3OlFRy/9MDbv9F20UrmwQYx5PhjWp?= =?us-ascii?Q?cQCqoPF2ZaXUcsjAdnk345m8dk8IbqLcZpNuaigbNvcnSBjcBwhGVJJyfGM6?= =?us-ascii?Q?3kH6MHY2ZjT+b4dyCoROLqNWEJKzR1ieFWC1ME05S4J0hvaHx+Jjw63MmrFM?= =?us-ascii?Q?TBGxXUbJPzkjyF0LiaJ4TgAzXoV5gIpP5nJeys/9/w0dkSKURp36BmwIgkMv?= =?us-ascii?Q?/uMX8pjJgrn8chn9j6mpQD59PcYGIXucgXfEL9qmDY0UTdh0JaKcFpFLgQtq?= =?us-ascii?Q?X7q21NAbov+2mjOuMR+g+kKQ1kKGmUz31bVXHztbihpAbd2mYOXfbzQW86K4?= =?us-ascii?Q?i/hfTwIo6aq49Mx5uNO1RKM2ndYlJHN7F+TXh3z7kFLUUse5ha/FMsAK2S0T?= =?us-ascii?Q?czO7UwiTXjCFZW8Dsw5XVPT1SKG2TLlnWwWCXlG0UJoS6dD5aRqnsBWwF5nj?= =?us-ascii?Q?WpCA0pyXSM7mHAwhT2kCi16qE///P/plYzfwHruiEp1plHusp05y5Pqt5+hf?= =?us-ascii?Q?7X/56hvC5Noy20qdUGkeMWmZG1uWhXrPzh7hTaVElbJJvVR0nbt1dc9XEgOr?= =?us-ascii?Q?ZEZmyfGU8/QdDvxjzqmaiFLg3SS6Y9OsHzYTPGcqPXtrLPHDdMRa7KfLjC4U?= =?us-ascii?Q?ZK0mKIaxCmVLktOZc0UKWlaRLNzpropESJWblakIb124OTazo/xp3oIZOZS1?= =?us-ascii?Q?S79ETYTaPITAPTpJtlCzVPXBfAFHsXs9RVt4Kt5EEG3QbmzfRMZWsKcxYfU5?= =?us-ascii?Q?6tQ9DoKwJqv4MU1/Mf8z2vBKUcvaeOO/rNxrho14BZGGLR84UMod5pGMDSG/?= =?us-ascii?Q?h3aNDZ3b0YPQX4ZQTXOqnQuuHrMBCtBt3IFkn45DKfvyD6jkA/q+CeqKrEg1?= =?us-ascii?Q?A78WmSG1EOgyCCUuZ3KDT8M2y/AzJlno+kt81au08l0VzXiDPbLwmDo/13Qd?= =?us-ascii?Q?TIhlWrXDJITjhX57fel0RVWrNdNfbmYeyzwrFJDigpWa+92gEyCMerA=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1441; 6:G2aGXRWZ4A/osLlNUUmKqMMJ7N/x8huP4EdSgp6VP8xKvYgW7ySpu9PVhhbAbjNWHxoNGokW7RcfsT3BMDBw8W846FiGgTBSicgnMrlAhb/kWYGCVVM4BHW0c4jO5DTTf8y4eZ2aEefbaW0+x2MAqwCIH3Dpd01pVBScY0VDiVkVV6pilzRRb+7UNzkSqPgWHFsK+vmJ5E6ZRYgmQrPefdRGeQXKIVO6OCasF0yFcveCqL1YwG+T5x8GG/pieyx/knjCSA7HCXmKCtnoHUftfWUClSHRDV7wMYJ/oLX5ZA8fq3zW6GZIn5Cp8K0KTCtNb2gj9JA2tbGulTp4EmfTRA==; 5:7YbmmodyD7WV8MbagBkMp41licwvO2Zm222WW+TsGy4kQ8V3zb5O5Mfdj8Qx332yDMGfcGzGZGQjiDJ1UbhzDmptTm8bSw6GRln6Et11UacJIhS6R/LgVnNRoADBEDMWgNrjwUgvpLfwPvgsR/IEPQ==; 24:QkRWbvUDTE4pFlgDdUErPSsjjGW2//lwshkf8iBfitXxdwP9NXgSvyD2odHUa2ofUZmggkqpxq0AYDZBIWK52wnJTNEdBw4wWZPKYxWC/MU=; 7:ARBAlGCsUP3TE9CmFI2hNIAlQ2XUPdBU90kiZxYCheVFIFunwKbwADkkBKXiXNZ1DEg2zWM4TpXDjfrjH65BNxLxBkl5Oe7kYkEknEavF21iG7tP7auOCQM2HSdROvx6ihaTA7Qb+zrahp/tmsC2qaq3H36Ie4e6FZONy3C37l0r6erAqp6Om1ijFz3cPjJuDO3c6naXEYBgSB9uOxrGdHJqP/bvxPcbUkvoy1a+Hw7TwCrjkKASW/t/njfK71lI SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1441; 20:6ht/02nSToxMy99+T5c6QxRoRnk4vMM52dh+9aNoxtvPWwgbt9cE16s/7dJop2yokmf9Ye13nu9/+OjbMk0OJOUMrfdjwMlHUBOaOhW1WbBc6+sryUjH3jnIv73jpuSabu/DkeVSlnfgUjB3Eaxx5KYpljtPHlUByV+n75VvQZo= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2016 09:31:25.3839 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: HK2PR0601MB1441 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/wm8900.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/wm8900.c b/sound/soc/codecs/wm8900.c index 5d8dca88..724cec4 100644 --- a/sound/soc/codecs/wm8900.c +++ b/sound/soc/codecs/wm8900.c @@ -1214,12 +1214,14 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8900 = { .resume = wm8900_resume, .set_bias_level = wm8900_set_bias_level, - .controls = wm8900_snd_controls, - .num_controls = ARRAY_SIZE(wm8900_snd_controls), - .dapm_widgets = wm8900_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(wm8900_dapm_widgets), - .dapm_routes = wm8900_dapm_routes, - .num_dapm_routes = ARRAY_SIZE(wm8900_dapm_routes), + .component_driver = { + .controls = wm8900_snd_controls, + .num_controls = ARRAY_SIZE(wm8900_snd_controls), + .dapm_widgets = wm8900_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(wm8900_dapm_widgets), + .dapm_routes = wm8900_dapm_routes, + .num_dapm_routes = ARRAY_SIZE(wm8900_dapm_routes), + }, }; static const struct regmap_config wm8900_regmap = {