From patchwork Mon Aug 8 09:27:49 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9267439 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 7D5EF607D6 for ; Mon, 8 Aug 2016 09:27:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6D0E42679B for ; Mon, 8 Aug 2016 09:27:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 61A7227D64; Mon, 8 Aug 2016 09:27: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 C4F6A2679B for ; Mon, 8 Aug 2016 09:27:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752005AbcHHJ14 (ORCPT ); Mon, 8 Aug 2016 05:27:56 -0400 Received: from relmlor2.renesas.com ([210.160.252.172]:50868 "EHLO relmlie1.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751985AbcHHJ1z (ORCPT ); Mon, 8 Aug 2016 05:27:55 -0400 Received: from unknown (HELO relmlir2.idc.renesas.com) ([10.200.68.152]) by relmlie1.idc.renesas.com with ESMTP; 08 Aug 2016 18:27:54 +0900 Received: from relmlac2.idc.renesas.com (relmlac2.idc.renesas.com [10.200.69.22]) by relmlir2.idc.renesas.com (Postfix) with ESMTP id 276184FB48; Mon, 8 Aug 2016 18:27:54 +0900 (JST) Received: by relmlac2.idc.renesas.com (Postfix, from userid 0) id 1B47F2806F; Mon, 8 Aug 2016 18:27:54 +0900 (JST) Received: from relmlac2.idc.renesas.com (localhost [127.0.0.1]) by relmlac2.idc.renesas.com (Postfix) with ESMTP id 16FAF2806D; Mon, 8 Aug 2016 18:27:54 +0900 (JST) Received: from relmlii1.idc.renesas.com [10.200.68.65] by relmlac2.idc.renesas.com with ESMTP id UAD19240; Mon, 8 Aug 2016 18:27:53 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'";a="216938054" Received: from mail-pu1apc01lp0021.outbound.protection.outlook.com (HELO APC01-PU1-obe.outbound.protection.outlook.com) ([65.55.88.21]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA; 08 Aug 2016 18:27:52 +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=ywKytroRZZ4OwmKoGbFf3/JciATGA2HnL63KwQvq49c=; b=nzLFXwzc0y8lyEWpTUe1lcNnQp8uwAt5s2WmaFg07jRcx6yUxsc6aPR9fdhhZEcAooZc9kpUT2tDvS3j76w+jQs+m7LBnlYJxgyGRw6wmjngOR/QqPr+wcz3N8QD0IL2JFiLuWJ0A8K7/K/SiJTHjALROuYm6Qi+tqJy7XoPUhU= 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 KL1PR0601MB1446.apcprd06.prod.outlook.com (10.169.69.24) 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:27:49 +0000 Message-ID: <87popj1utd.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 130/159] ASoC: codec duplicated callback function goes to component on wl1273 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:27:49 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: TY1PR01CA0070.jpnprd01.prod.outlook.com (10.167.153.158) To KL1PR0601MB1446.apcprd06.prod.outlook.com (10.169.69.24) X-MS-Office365-Filtering-Correlation-Id: 12a2f1e9-6304-4f53-f337-08d3bf6e447f X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1446; 2:Xqg52PeGnpjuW1L4CVEeC1lrGt5425ut7rNLT2EEPZHsovpJrSRiOs2+YDWKZsYFDdaxiLt8bsVEeC5qpjOyU715CMNNWiRkGxvU0kiPb5bKmxqDbAe2Nxc8pRf/MNS8H3O8V91TQUvGV3E8JbMKwpuwQNV0pOBeSPmeooOQ9t0bcFgizsEnmK+GAXoeKpEv; 3:9kRwCxnsQzKTuiy7t589OpboanRHRoL/R9nULMF1Ydk0ljFfEY/q9prj8LyyHKhSFpjE3r84s8K2aIzW7EigDfHL9pGcaNGVxJePwS7shV7qWyUfDonq9tipZSCUrjFz X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:KL1PR0601MB1446; X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1446; 25:iUQhHLonvOwVBXLVnFm4Admz352bzCeKXBcI7XPWnnhXautB61y53CjiaUQyvgz6JV1iXDqXiqILi98qjyaHywRdY0UV38p3IRsNz3TLd8ioMtgG+jhbXNf8OCDDign14VFvP+TkrEi68+om/G/GnnVeo+DdUAlisqzpjIEhhXxhGzCJf6X/vYHSypgcvLTmy2lCcDMx9ajckAdOTY9LKIeN9H/k/VMnDNigndJiv0Bi/LpgNfZxJrmoNfmLTVE85c4uyX3ZFnne3HUGxCD4XupLx+rQzkA5XO6o8sIHuqF053vzMm6nAV95aMDCICgvIBSx16nAQYrd8kqd+199O1y5xUjoLytKNNNh8F9VD/86ZOsuDvvMYTJZs0EM452RPaSIKBBauVEi8qhBUZNpMrkbm3goto/0fgnCOIJx3J8fLZxHVS8ceIEi423DPinwTzWZANoxEC0w1XVYbz82aUVivGHgiZcNjCr8ZSlaeE3dbM2pkTVJWKmNW3NcejMotqNk0voLoOD07fWfVdEetrvXPb4lkzXgzNJToICXevDi6UnQRYap7I/DNk7EAPImNSNhgVPR12CBFLpmHQDta9GV642wwW7Aao0RHem9YOPWsONwDbkbEqXtS6sXtgzw4nwfatGnPKT6INv3QRJMoB/iWGr806RGkIOvfkK4q8cWize6sfQcPsvrVCtrbCC/m7/8o1p+uRZz2+XYuP9QUA==; 31:W8VJ0/GoPWE+B+liN0N6AkuXlwizWXTQHwG9by7Lj6JVXmjDIeILBtPTfN7efjYotJyAlwO8O01wJymhR+//KpntE1CrcRYGPu5P8k56oN6kJxfpvIZcLAFOUNYTd+z1p0GpkxX98tFbJ8uqPrCjO3raiLxKg0b49S9vx6jrQIM+z0xowxtwcDceQrPUc+/SJFXm/RpDjIP ZGppenFsQylsOJ6H9ng7cpZ9/Uw1b+qE= X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1446; 20:jPGMhMHEd/gF7rP98cWwESZDx8i+9t7E/mS/1OGgnyKKzL/plSZhm5ov193dKtXiKo4kBVarXAPJ3cn7tq2+eKCyVl0EIZE8uguPSC5jdv5HC/eBrVjZy9dhyRwD8Q0RntDgpbhdAtM2xXwWSzR+m6k+I0OJpWvKlVQBWaofTj4Yg/piCh3YW4PXuuBgyJF/Wp/Oobf7xV/MGG9i7ILr4AGjzyU2tZg5xfblnVwo4jL3Y/ywuq3i+c0tu3zcfPtabt0Iw7wS+tqbCZ++JRtMskJIINwmT7aEFaoqcLhwAcHplxzWQEJUv3vHa/ewjQSiLc1VlL8o29jz+p/VF7lZOu9FsXvrW8gOWVhr79JHPtnNGVM6X+oSz7ikm9ILOAfzHBAIIk7jaipxBZQtaLPvB/ZOr7oh/4kWSBE38DHeYyXtgb87GBIRCs5NTK0nHAo+oezpbwZvoB03yqOqQ/RQPpW+osGMwnVaQ8nTOJOE0J+c12UjHgB9L4x9lqdxD8/0; 4:IIBfwHb+k8E0/vIZASdCu0r6rrfDQRv8buDPl6sA7w7dfgCHyElXM54+H1xpKor86kWVN+NyAsROT5Ax3Y78q7ODFtZXGzp16k01nuLo7Fgbfkk8hKSRWcqFCdhgXiaZIRfjqvxyCm/bs4uF03nGtyz0DhnFeqqX94KDEitM4t15PQukb8DuHTmHsT369frAZ06n8maJGuPz06IT/OfvzrJVBS2nFoNqMhiABTPIRBu7ccyivjdqp7V+HU+U5Hxc1CXCeCumulPWeV2OWOaMFWPuAzQEba+7Z1QJbdzXUEyvM9QEe9tMyXDN0o/cPdMM90nvY2nJVDijIy/2TE7/TVx+fPWyAF6YkTTmAFISZqhCuLmqxp9L0g3QA1m7OCcR 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)(3002001)(10201501046)(6055026); SRVR:KL1PR0601MB1446; BCL:0; PCL:0; RULEID:; SRVR:KL1PR0601MB1446; X-Forefront-PRVS: 00286C0CA6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(199003)(189002)(42186005)(189998001)(305945005)(19580395003)(50466002)(92566002)(106356001)(586003)(23726003)(77096005)(86362001)(6116002)(46406003)(101416001)(53416004)(36756003)(3846002)(105586002)(4326007)(8676002)(81156014)(97736004)(4001350100001)(33646002)(81166006)(54356999)(76176999)(110136002)(2950100001)(83506001)(50986999)(68736007)(19580405001)(66066001)(2906002)(229853001)(7846002)(7736002)(69596002)(47776003)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:KL1PR0601MB1446; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; KL1PR0601MB1446; 23:RQs/dHpk6+XTuu6CL2areh47IRkynTx5seTQiz4?= =?us-ascii?Q?ZIzHQTa4ccC7WU9Ur63OoOh5cDmjC3lTe9ZBaWfhhpL59KlVOxOYKKHpzALS?= =?us-ascii?Q?P6OJ5lef58jQsWSZ4MO6bWHZC0eye230C3o22txrXiwpHhBgcifzBXIWAOfi?= =?us-ascii?Q?f1LmWeG7K/GpzpwP1AAVGR6MJqoL69uM5CekK58BAewGIie7JLu+0FVKjBzg?= =?us-ascii?Q?oTloqDxzjVP9YizIbWtloAraTUTU5X3NE7I+ZCHOi5006nYbTtuCXmmy91iY?= =?us-ascii?Q?+IBmZTGUhrZg4LtJO9K3BheDNR1GUHIrL871eJ31rYVSw6Z/k36ANUVbSizC?= =?us-ascii?Q?lpULVwCt5RPH/FaHwN/rtUUOtNEJ8yoeKPWymOAdVwkB61TAdbJWkFUrN2MG?= =?us-ascii?Q?gANlrTkXRqm0/+ns99LpZxV7xunRRfM3qdqYHeOE6BBjVs12aatMoV8IeWbT?= =?us-ascii?Q?AKcBVLjzcfkQTgj+k9UdF7V7cH9PhCLQDhRmcvfVWINF1eColEnL4mpqLKvR?= =?us-ascii?Q?X9FwwKtkKYcb/AFAsZ02rq2uIBxjMCFrJZsW8gLfiDXca9yBt0/QdopiWDAt?= =?us-ascii?Q?+CTDHOsGQNa6sqVoeRtJd7Vs11w/JzsJZ6IeU0eJE0RrgVCNrkcovCtsN/VS?= =?us-ascii?Q?kgX3KuQYYi3UJXP2xjj/O+fZO6/tmorFCthG+jzp/vJJIQcAX9xLfvf6nLx/?= =?us-ascii?Q?iR6wsN6D8RUGKhQjpg6q1MUmQlrPYFtB1ZpzQJJsvfgFmEme5i7AoA7zS9LQ?= =?us-ascii?Q?rSdW5zmnvNfPqOD5tGWNQqS6l7vMs3AXHGDOSvW+iYLaPMrFbBvjow1G43Kw?= =?us-ascii?Q?OHx3HNZdeekO+c1YE8FzW2eaEU/f17mTPlxVyz3JQMfGGxDYgLtEusfpk32p?= =?us-ascii?Q?lVV++a5dbdOcsDp2B80qwKwpfFNSpGbmL0KQIbXKRwKZOj67nGHuDB58rUT7?= =?us-ascii?Q?qKOWqlNJj1R/iIuchTxFVlpGVZEvev0dhSRa15yvy0rAM8YigUt+HvLdVRFE?= =?us-ascii?Q?7PRVRE4Z18KhbiNWOf48wgoF0v45o+f7ms/g9p5E5a6gRS58BU70nnZyNYXE?= =?us-ascii?Q?573mBT/vMRL0VBfk2hpgujQqZB17tExki/hwq/wypguydEMIhhDIhZBCMshl?= =?us-ascii?Q?MRpoAJw7nGp9z3rNgLrHLgOW5FPk06H1LanqDqe4LFo4+uyQ7/Pi47Q=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1446; 6:2LZdS505UYQIJzG9NNVv9R/qGKaFHQudnuwVNJjZwWUKYonB4b1sW3mb+5hLqe9GslGfqvNzDkfK2tQ21MKnEPq3NgAeqhTEZ83urajC1BvQRb9FybPN8RtzuPaYdwsWm2n2sxEB1JkIDxUDmDH2ug8uEfLqI3NJAYyPMuXdV9lMiYFVWTP3H/adEsIQxZqJyhTpcVVNOvS5IxlPuOjW+t9iHi0/NKlLenlG23PYyBJ5vuxBPcDlxwDlXpusRgPElUu3UPKgbRso5qoqIosPKTnOhwdo75YhAW8kjYXA3UbVsyb/MioD9jqUfRcSd9Egdkt0piKG4pfwgrzWmUO97Q==; 5:FumLPYgoFn4zKUs1qkhWSVFCsDGHi2qcSARFnN8z5CD5BnDczFnFgP7aYHTRqijsRcieO/srwPmQfuIu8K2Y6m+HHSBW7fw7BJdr1Alm+a0d8QZCGCYIM3wFdN5QQMedAUk3u0XoHzR+jI8UHux2Aw==; 24:T86Oabo6V0MwB0JldTP864IODTpSGglLNKNNZwzsOicf1vTuORAKIsA9vVnFVZs9Twtc+pfOujW316OLjrEYMajkEdbC6rkn4jw8LjpuFEI=; 7:yxtYNCt4CRTRR6SvSaoYbvFcp5Nv/iFYkVuO0TalfsaUsKd07pNOv9OxQHUxOVxnLOHvow8hspzvGLJNxl9uudrsnftPVz/Tb7pEaGEPCj9sCcsmq4eoLG0BXX+qN7Dc0DTeRKLGxgTdPEDQc1iaa1yKxrEDklZ/DxApjQP4AxAR6B5qsDRQfAvgnxkZwlCdojpZQuKcaMo6QOH+gftNq6Ymltk7Wzjd1N6+k8/LuJWej4RGwJZdC1t8MFiTXJX/ SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1446; 20:ekCwfjG3A23+8dgbQaVaGoxfaFooHWsl73LmCc94bawUwKwMaaVMnJCrHJv9K9UfGuCjmY1VB2+yDPde/jZFiAv7UaafcBg5JjoiI2nrg4R8Zrm5I9wARIBD5FU9H3Qmu/uBtEtDs33oluBYBr/JQHfRD89b1Ff01WY/zUHVKpY= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2016 09:27:49.9740 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: KL1PR0601MB1446 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/wl1273.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/wl1273.c b/sound/soc/codecs/wl1273.c index 1b79778..fcffb6e 100644 --- a/sound/soc/codecs/wl1273.c +++ b/sound/soc/codecs/wl1273.c @@ -484,12 +484,14 @@ static struct snd_soc_codec_driver soc_codec_dev_wl1273 = { .probe = wl1273_probe, .remove = wl1273_remove, - .controls = wl1273_controls, - .num_controls = ARRAY_SIZE(wl1273_controls), - .dapm_widgets = wl1273_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(wl1273_dapm_widgets), - .dapm_routes = wl1273_dapm_routes, - .num_dapm_routes = ARRAY_SIZE(wl1273_dapm_routes), + .component_driver = { + .controls = wl1273_controls, + .num_controls = ARRAY_SIZE(wl1273_controls), + .dapm_widgets = wl1273_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(wl1273_dapm_widgets), + .dapm_routes = wl1273_dapm_routes, + .num_dapm_routes = ARRAY_SIZE(wl1273_dapm_routes), + }, }; static int wl1273_platform_probe(struct platform_device *pdev)