From patchwork Mon Aug 8 09:30:51 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9267477 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 DBCF5607D6 for ; Mon, 8 Aug 2016 09:30:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CB83425223 for ; Mon, 8 Aug 2016 09:30:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C01F026D17; Mon, 8 Aug 2016 09:30:57 +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 56C8225223 for ; Mon, 8 Aug 2016 09:30:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751865AbcHHJa5 (ORCPT ); Mon, 8 Aug 2016 05:30:57 -0400 Received: from relmlor2.renesas.com ([210.160.252.172]:20429 "EHLO relmlie1.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751259AbcHHJa4 (ORCPT ); Mon, 8 Aug 2016 05:30:56 -0400 Received: from unknown (HELO relmlir4.idc.renesas.com) ([10.200.68.154]) by relmlie1.idc.renesas.com with ESMTP; 08 Aug 2016 18:30:54 +0900 Received: from relmlac2.idc.renesas.com (relmlac2.idc.renesas.com [10.200.69.22]) by relmlir4.idc.renesas.com (Postfix) with ESMTP id 9EF9A59D2A; Mon, 8 Aug 2016 18:30:54 +0900 (JST) Received: by relmlac2.idc.renesas.com (Postfix, from userid 0) id 8F27E2806E; Mon, 8 Aug 2016 18:30:54 +0900 (JST) Received: from relmlac2.idc.renesas.com (localhost [127.0.0.1]) by relmlac2.idc.renesas.com (Postfix) with ESMTP id 83EAA2806D; Mon, 8 Aug 2016 18:30:54 +0900 (JST) Received: from relmlii1.idc.renesas.com [10.200.68.65] by relmlac2.idc.renesas.com with ESMTP id UBA20560; Mon, 8 Aug 2016 18:30:54 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'";a="216938337" 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:30:53 +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=6IYxGhlerMLvCjINbzh1rrxsI/joAkj/YcD0REDk19A=; b=T6XFLa5nuBdEdfVpFyEEdgenm70HVp/HDkiRtUn/wchYqoKeTGECbRSF8RcuQitMamOBFO0TYjXAYHLkdYnITt3rnT699kGu1zTT1zyE3dvRNLo+KbXh1A4XfQnnWw7XlFiFob+G9yJoBrbG7+4BsmPbq8T79/c+stMwfkad3wI= 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 SG2PR0601MB1454.apcprd06.prod.outlook.com (10.169.106.20) 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:30:51 +0000 Message-ID: <87bn131uoc.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 140/159] ASoC: codec duplicated callback function goes to component on wm8727 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:30:51 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: TY1PR01CA0125.jpnprd01.prod.outlook.com (10.167.154.43) To SG2PR0601MB1454.apcprd06.prod.outlook.com (10.169.106.20) X-MS-Office365-Filtering-Correlation-Id: 1d6f681b-0fed-4903-214f-08d3bf6eb07b X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1454; 2:xr3ktViW9o862eMAfJf0cLkM2JjVRhLndfld4GsgYuFZ7haUSrPBZwTCARIsQqyDi7P+lkpbp/oJh967i3XKHvSCXULdykbF2TOSqWqayjmv/4qAMDrOZy5SRCacdx1tgdmVGfCKu3lUwjX7g0V+fo79OgfxYz9KMypEG9nyyROAx8lvPV5PedURQFJvhLMt; 3:LXEE8FJofyKj+T/VMk6rPeMDFgyQcsDevh1+prTyK+6uEQ631qhwWeKr+s34ejnklYTzd+oRaZiXFXeBL7NXKTBubsIZ+iIe/azHcntdMjTsaKkGuYBPA+Bn0f1buUhh X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SG2PR0601MB1454; X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1454; 25:YTuSoMPESlbQZoTfqO9XIXQiBJU5wHWaF5gzsr9m8NbiOAiSUYMEbDxm5NS0bJVAPAlZnpKUl/AsYAKwTeWewGU9CYZa38yLb1vXa6RKGetYFGl5Jg1Cw5QR5sNyS1+JAxdeoh8CmxDoMhamJF415fM9fHf2hM2lAFNsy7n2/npbHQ14z47VPOCX+l2YqChHMCyfUMSRwpO9L+Nah80mGXzES6wQYWrZajlZBV5PolES2Jlv02CPW8dLLO4oijUV5LaBwWi9kAL2aGvyQdRILy8/dnj368H7j7GadL5ffH8tw497IFSNigm5NviRKO1/B3jpQqi0Q46x7GzjAqTrGJ6Eq+FSbvo5h75AGLyQhO5PB9cMCJKxaZYI4kx6Q4yBur6KKa1pSqdNTLqRkucnRXKjOzy0nFOQqpJ/AtZUIbMLTtw1OqSF4haluIJ/3DmASIInjmLn/NMmBBYgpxAWvvWvDdipMigA4wrlM3mCliQx2CPIQanVAGDYIzTY1lHR5z7rrxlldLojeH9yqerO03DTBVlyfWJEMREiCDsNMhK0WSxpI6a8j1x03YBNvWWYSYt8LvTAYuKRDeg6F5HNId7HrGzXNYL0HkFJ0BfuTKoG60WsEqbw/v0Ytg/bBA/inQSDKC9laa56IveXbGuU+UFyG2ybD7iQaz2W0MWO3wqui9np8WQ+eRaONUSTHAbA; 31:1yHYC2HO0VihthKxs3X6FJ0xq/WwU1I6K2J3/nmapFeG8+jYsqfyHB4LezJxlHEaIgPDNZao1GTQQOaHal2ByPpSqKAx1d07m8XYiirpUrKnsQ44h9eNNaG+If2kLx7u1Yu6nJcGj0aaAlhgarMWlOI+HvvMxytayqBX+4nyCY8UUyvtbhn7fy6rk13NzELmFEh+aNdegCt/qYU/lnbVvT3bmeMp1BCMm0Y YATve+ks= X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1454; 20:obyP0nWHeaQdGdfSd+KMm5rOb4isKTJM8oJkgh2gUjqg9zNRIyoPcuS6IqoGxbX6Yaz5wiQDwGPMraf/YRGl6mjZv04FBsG3RTLjSq+96vbXUPjrk52M2HJ6p0WDM78f0B8chdPU2HHlObQNr9fkZ+h8+ZSrSIlTsNW5xE3LYMomeEmxxoWKtquFtEekKsPnVoDL0GDMaUIvvaSlemy4vFITbBkG+ykIdjqYJi3pMMP+lknfGuZrEOgon7r/DFmoGqNOHRSxdf2QkStcvKN8Gt4zTWhpbOpHsW0ojhJJgStiJ+Ckwhx7qXIykvxi7BiUmmrN5DoiGwx4Qzto9N8eJgCdpuLDYTefARfhySR1lOEg1TXZmB3jEg/VC3ZtTKTqtilkW8be4Cv6mByrOBb8ezWjoArTR9eL74PO06zp5Bb79/kQ4gRtWgiBp7qX55TpYFBdpBqECTwVWwWj/QtB0+on7MKxjcgrr+jqcsWoQN4t4gWh0pTsis7WKzxslIoB; 4:ciQAiRjpYtQirgIM7W9iIDiuxJ21USu6eW6YaWOSykQJbKjgibmVMzrMkvCzYZH5k0RNHsXmvd7CrDm+ZXLHype6jorclW/N7hMDndy3L2I2vagllQAJPkrIxNHHJh8rTYhwrV5sYvhWxsQdQ4z87vnCT/ZRVvB0lZJ0bHo0XZjEGR+XeDak18TcM0l4z5pMuKXcZBIoTvh18T00Ey3/aBlZBXY3q8r7DYOBdINM3pCgSSvb3O1Zb7n3f5Fef+KFPqN+QIl+TPOiYJE/eHUafvIhy962Vnhh2ZgDRqpz5272S2BnhPJEKB3fdlhwCUmmYdLQ3eZNbzwGF6Fj1eqYNw2pi+fwdYIMUCjLRXejbxSevLdcnkOBIq4C0BtLl03TRDuetF57ZcLmU4n3BbY1WQ== 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:SG2PR0601MB1454; BCL:0; PCL:0; RULEID:; SRVR:SG2PR0601MB1454; X-Forefront-PRVS: 00286C0CA6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(189002)(199003)(50466002)(7736002)(7846002)(305945005)(106356001)(92566002)(19580405001)(69596002)(86362001)(2950100001)(81156014)(81166006)(66066001)(47776003)(19580395003)(229853001)(77096005)(586003)(68736007)(83506001)(23726003)(33646002)(46406003)(54356999)(50986999)(76176999)(105586002)(53416004)(6116002)(3846002)(42186005)(4326007)(8676002)(97736004)(36756003)(110136002)(101416001)(4001350100001)(189998001)(2906002)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:SG2PR0601MB1454; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SG2PR0601MB1454; 23:3xpHMDYm72hrine9SWQ9/M/dA3E0CE7uSvCvu/w?= =?us-ascii?Q?vf43srYmpNelcrz54QOh83Qhxn03fQ/LpZ/FGGYCPXzjUVy6Wp6BuCZOVzyz?= =?us-ascii?Q?LCc6z+LIaps7Cz+rCuLdQUY5BKkh66U7XwECGqx4rnA+PcdJyukmz2SrLgrE?= =?us-ascii?Q?LZ+ulAW+S91SJdmIjux/ojbtyJqRyZKoFzlfGRxv+FP0/TgdImnXeKKSEefC?= =?us-ascii?Q?sw2BIQCVFgzh3CBF+XMu4Ezw2FWYlzOvrurEoYt2IAe5Wrd+j5YuowsVzMTh?= =?us-ascii?Q?wnm+0r9QvpSo444Jz26i4jYd1gsA6dcTEEvIYUeMc/xvZ7koqS8MH6qSsg6q?= =?us-ascii?Q?KZ2Aj+wrBht/UabDatMQUqSRLpQu37kuKu4BcxZDrp9/P+L/FGFh+NJCTTKu?= =?us-ascii?Q?Kbtjthied1R38HIXJ+PSyOCBA7ORXQ8m+8xlqnKq999nhvyxH/3v+fnwsHbi?= =?us-ascii?Q?XmIvhEF5PsucM/Vwr0UqyR/IvSpqjPxJFAMKKzFcsZRQ1lsOlsWl8TvLq43u?= =?us-ascii?Q?RDFyw0/f1JCPRsWV7fC9TvOKECf2xACFGblE09cG5N6OHpOgqQzCxZ8rukPD?= =?us-ascii?Q?71mFOy6C6r+WogLPOQdUuJjGEFw+URtZxrchVh2ButVHcKPIb+/I2tmoRBPJ?= =?us-ascii?Q?euiscGjcwfvp0yiKKnOml/EBRSSjQqI+g5uDA/KyRiuzkuXUeiIXlGJgaSAG?= =?us-ascii?Q?dd5sshejbjWMT9Uar16kajxSZ8fzXRIqugQZtmbxiS85PD8j3JF5kP1EUjBm?= =?us-ascii?Q?9g0pEQ3a1NiXbD3Iky8yuV1jRYtYPScsEOOp9otZ3FB0EtkF2tVGgT6JMjhy?= =?us-ascii?Q?eJdHRajXllEwzKRox5HGYZPO/bx4OZX3mUNK+jQp6Jz/J6OKnJ7lMsGrdMSU?= =?us-ascii?Q?yNh/gBTrcUcy9Mnb3aWjh+Oiil3GYa+ykcWpTEXnTpHvK4iVBSpITSy9DCZ/?= =?us-ascii?Q?1RbNAqLoOCodMlvmrLT2to1fVItep0Mgnzm6GRuNarknqEYIIZ9mk1OaBhZH?= =?us-ascii?Q?ec4g1ZCIligU/dEZkfkRVwK7VUO4pEEjlxfnrPyMMO9zx8kBGAxObCjbLh/R?= =?us-ascii?Q?QQ9DYoB0SBhhBVWRHk6xW/9qiDMBgbHvfBBI4kUMRyFbM6qGmtDTbq0Ozt7e?= =?us-ascii?Q?3SWk5dQ0zVICaKFD3E3tlQyGM5zvDEsDPkQYfASCWYShfJZOxqf/6kA=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1454; 6:rQosmtF8sIISM1rCKZlr+QsHmA8L1dL9flc76BxKb1qgxFnQZIFf6unV4Z+MttjbkMFI6kyKKcwFdjRfEnQlM+7FcGJDEJ0ddD3mjeVnMcDuNVT9OQo2b9rd6uSvacQkr0/SC9YMRfkXqGI0mGEjP+xR3zz6qCl56zpXXlCP5oJclhEaIbab76N3IjQqTAEjPmDlrhqYS8ZMIX8XmEDihwm60auki2vTLR8wWaPLFaWFn5zx6piSDxXhvd5Smqpdl/J78+6r/caKS0Ars5X/0SOOLbH7HixHHCnHfbfmvb/xqkQrKlBgvn9tMyUUwTWJxdIqPChpDvQT8M2g2IJ3Ww==; 5:paiGh22LCX+d5YmyoWCGd7Ay9dfG644nbfwZFaTuAr8i44AnOLuEkkQZxKDyPXKURQ9t/amA8eA8X+6SOv+7RIqYw74O3m3jRN/bEVovQuVhNjgXrOtA51TlAwH6ZQEHF9gYqseoZhT4LhAyve0yKw==; 24:BUR/d3sk4iz45lj+juW9wObtTh7iLP2hSGi4r95zCaIaBywuaf1XID7zyj/BDsrbghnOMiql3O/i0rc1ly6T/2LvxntPMyR3QzsF/F5EIlg=; 7:+Y8dlDvdq0DRkKh6jMvCfVkFj9oAeQIF+z2JuElqEQC0GzOReSVKs++WHrsauo8/K/I7ZLBC9ID9hw53QHRUJiZ5qy1L/TaZPUwtFf9sX0s756bQgcYDzMw27z1P5hA6Z1p82prMsFhcCGda6CKblF8FgUhzH1tWhdGAr7NGZPeRjLwVZYYS/DfzNjZcRuLyxXBxx86jp8nBdp49GbEGd+llXjVD7HK+yusGiZwWYDz5t1hABvwUzVzwPQpIjWda SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1454; 20:4WiR877zDnFeUmxc9Mv2tNQi7GBhx4GjYBCysb787ABotnb9yESL69PjE8z/PukjTnszk7qVFyJZyM64Pm1SmRvfVn8Y7jwNLUM+DgskM7lcGOOcvWIInKhgv6IPHx2sXPmiAHLV3/gV62Ub8+5sicQoTDw28FPysQ1PdamvujU= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2016 09:30:51.1784 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: SG2PR0601MB1454 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/wm8727.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sound/soc/codecs/wm8727.c b/sound/soc/codecs/wm8727.c index bb25a75..b01e64e 100644 --- a/sound/soc/codecs/wm8727.c +++ b/sound/soc/codecs/wm8727.c @@ -54,10 +54,12 @@ static struct snd_soc_dai_driver wm8727_dai = { }; static struct snd_soc_codec_driver soc_codec_dev_wm8727 = { - .dapm_widgets = wm8727_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(wm8727_dapm_widgets), - .dapm_routes = wm8727_dapm_routes, - .num_dapm_routes = ARRAY_SIZE(wm8727_dapm_routes), + .component_driver = { + .dapm_widgets = wm8727_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(wm8727_dapm_widgets), + .dapm_routes = wm8727_dapm_routes, + .num_dapm_routes = ARRAY_SIZE(wm8727_dapm_routes), + }, }; static int wm8727_probe(struct platform_device *pdev)