From patchwork Mon Aug 8 09:32:54 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9268195 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 A85AE607D6 for ; Mon, 8 Aug 2016 11:38:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 98B5D27FA9 for ; Mon, 8 Aug 2016 11:38:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8D8F528169; Mon, 8 Aug 2016 11:38:46 +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=-1.8 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED, RCVD_IN_DNSWL_NONE, T_DKIM_INVALID autolearn=no version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8CD2D27FA9 for ; Mon, 8 Aug 2016 11:38:45 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id A68E62690F6; Mon, 8 Aug 2016 13:38:44 +0200 (CEST) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 1BC41266E19; Mon, 8 Aug 2016 12:09:33 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id D32E1266E19; Mon, 8 Aug 2016 12:09:31 +0200 (CEST) Received: from relmlie4.idc.renesas.com (relmlor1.renesas.com [210.160.252.171]) by alsa0.perex.cz (Postfix) with ESMTP id C53C4267650 for ; Mon, 8 Aug 2016 11:33:00 +0200 (CEST) Received: from unknown (HELO relmlir1.idc.renesas.com) ([10.200.68.151]) by relmlie4.idc.renesas.com with ESMTP; 08 Aug 2016 18:32:59 +0900 Received: from relmlac2.idc.renesas.com (relmlac2.idc.renesas.com [10.200.69.22]) by relmlir1.idc.renesas.com (Postfix) with ESMTP id 70B0751B20; Mon, 8 Aug 2016 18:32:59 +0900 (JST) Received: by relmlac2.idc.renesas.com (Postfix, from userid 0) id 5C75C2806E; Mon, 8 Aug 2016 18:32:59 +0900 (JST) Received: from relmlac2.idc.renesas.com (localhost [127.0.0.1]) by relmlac2.idc.renesas.com (Postfix) with ESMTP id 53FF02806D; Mon, 8 Aug 2016 18:32:59 +0900 (JST) Received: from relmlii1.idc.renesas.com [10.200.68.65] by relmlac2.idc.renesas.com with ESMTP id UAC21566; Mon, 8 Aug 2016 18:32:59 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'208";a="216938492" 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:32:58 +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=ADIJWOVlh/OS4pFktEMNFuKCKBlPDKn4FLbBcXIGHYg=; b=hOjOj6hcZ2u6oggDDub+JhxqY6RAmlkjgNqGsbjXlewR0xZANDsn756DCSAP6zbWHBdnjf0Ta+2XEWA+WG0QEGWgVUU4TdvfyfX8vol6g8n+sDE0PAC609V8+CzqP0KjlUT0I1pkrsrtBEr30msFRF7w9AyFY2tHzu0XSdfLoGQ= 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 PS1PR0601MB1449.apcprd06.prod.outlook.com (10.165.210.153) 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:32:54 +0000 Message-ID: <871t1z1ukw.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto User-Agent: Wanderlust/2.15.9 Emacs/24.3 Mule/6.0 To: Mark Brown 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:32:54 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: TY1PR01CA0036.jpnprd01.prod.outlook.com (10.164.162.146) To PS1PR0601MB1449.apcprd06.prod.outlook.com (10.165.210.153) X-MS-Office365-Filtering-Correlation-Id: 1a22a2e3-153d-4df5-5c01-08d3bf6ef9fe X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1449; 2:27IognFSXDb5wXguqDA65+hejkmF5UhlkrtH8ZrE49naVEY+uDXJmYE56md3qpQaHYpr1ArQIEoxS8SGM6QwUvzvvhczhkrrdr/Jv3aJnBHSfUI766B1JUJ07WgdPtZNljl9/9Nnti0fc7xKd/AIP9LlycSIpYIXbYundKY5iNIwrHwmXFdgHd3ovIF+9plp; 3:JHsWHn/AswkVVvN03J9kp3VxSssUkRr9IIuoggVonkOR6Iyk0X+TfAzDiOlbjAeCiGWViAAI/WSaCR72+FaVwoHaxqi/Uo2nb+amZOlEil1ugyC04jJndeKTC1dSSQfs; 25:PSMxkxOlU+ovjpWpZioKcqysl0fR/ArMuifwjhgpq6MxlSTulZ5fDQBwVqF3Z+xHbkjIIkgXDlYGv9U14re0L69vzafXnLkm+wnywqb9aK5PLVKqCx/dmKEE15l2lWHCBrAQSMpcG0UY8otwMsLC8VjWkyrrpOmXov8HSZuTYLGvwdqOy673vFLAImDOymwVP3h4GfSEmRwIkiGji+asjWz63TkkprnR1rn33npytqWUK8ohBhs3MwVZ18UvmAKSMFn8qcAuR+oaMm415RIfbxIEzIOXyWtG78Xo8L6sgrxDDSKyQlr4R7AIJtwi26Lid9PL8E6Q8VmNMbRmfnwpYsqjScmOIk1aDURJUCvxZ2vE+tLWjx6Vg9Nz4FHCCyrxlu2laUrrvIftuFUBbAh+E13AP4AWwg1APmF5vaenJQo= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:PS1PR0601MB1449; X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1449; 31:l0yuDyUwtjXw6K6ULkFpKNxsTHJz/3S8SvnmCF/79OwNa0OexHDipWuqqSqpzzJjd+9ImYEox/q0rb4X+5v1NDO73DmbRQ2W8xYQoiy8Act3EiJuIR7iAdTqjl9Gy/GrLBc/b2CBG3kWN2U9HBIBpfzGeYt+biN05+nQXK5ZJa1FpwIjzaSDT6+LuTUG5rSomb6MsJMO/VQt0mCcZZpIzTdlSE5oMDuEmJDSp4P6UE8=; 20:ZeqM2pTucduKr/s4og0BOA4XwCfdxA3KMn0FGuIUeV+d1Rx90FhgwKy966MHls8/2atA0Pe5tvMUe4Q1wHAFcHTZ8KvBPaP9ReBHrmT2O8sw9ZFQqLrD+TlBw4Aw2ixJWDHxdpe3hKGtJURUqF0Y+E5jJnI5mwwK8/17AYnG0h72oSmr01Sy12IyWH2gM5ehGlawbaQ5vcV7fKJsGBFs5gEl0MbeHCg7rpuOJMzQfqjVcN+mPPZcHL6S5J/gprJpde4zcNh5fG/j6cZelHqcWDTU8Y5ERo45L2Wj4whAfe5yjjCjla2m+NF+r7dAPbYMN7Zzs6SfueM/BjCHhhaG69AvAvXYlSPNGduKdWPIRurLjR++g+xDxMMXxthkNPC6QElLGSWmb4lzIQPWyt3/CFxd0jzt2gM8GYp1vEPZHT1oM+P6QmK+6KUsRyvooBNnA9kLZ0ovy3FkBGYl7WWhE60W/SVF/5viK/uTWz0J3yfuoM7da3aXumcdXRmfOnO6 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:PS1PR0601MB1449; BCL:0; PCL:0; RULEID:; SRVR:PS1PR0601MB1449; X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1449; 4:+MLRavs/xpnYhUo3+MkXyG2RiBgJzFWaZCNx0P4pha7eO2wkJtfkhgNN9Fv2NAJzU3boDE60LytrRSqDQWkpGqceGW4eLPBlIsLi9HuSmmMrQow8V7SclkeogrgTmTy7uxEXZdLzcbh5iXmg5r7gRQ2NFvcbaXLXld5ZXz6WLoz55de9YHIw7csGx/GK34yGoIBfRwCkjgXM4eRe9DDrkG3ArYvrRmiTWGwW9jX6NNypQQAeceqobD0hUj5We1PnMHv+tw/hB1OMWEwfEAebTtx/fpt76pDUifZhXfpkxs3Qn+EW2b1RJ3WbfezGc+sHdFCTnZB8BVTUwLHu9naxnnBT6gtUSbAAAbyNlFa1mJXMHkRWczRdlzjWD8vNjscjBkBoGCfwAdiFUNWSZyCpuQ== X-Forefront-PRVS: 00286C0CA6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(199003)(189002)(97736004)(110136002)(66066001)(81166006)(33646002)(3846002)(101416001)(68736007)(81156014)(105586002)(19580395003)(42186005)(77096005)(19580405001)(69596002)(4001350100001)(83506001)(47776003)(7736002)(86362001)(50986999)(46406003)(6116002)(76176999)(50466002)(2950100001)(92566002)(4326007)(229853001)(586003)(53416004)(305945005)(7846002)(54356999)(8676002)(2906002)(189998001)(106356001)(36756003)(23726003)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:PS1PR0601MB1449; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; PS1PR0601MB1449; 23:u+Jp8+0q4CDJYAJDY52oKl4wEPRuE51d1j2zGRn?= =?us-ascii?Q?5YaqA7tuRm212XWu4kHn3kYmbjgXQPdul0CuT+JLwjt1K5TCnqLqyloeCRMR?= =?us-ascii?Q?Kgxvuk+auC8WtxBVSr7zEjkXP54RWSfgZcuzOgjwl2H6UBdTUZ9v6vo+Gvog?= =?us-ascii?Q?cdxalnrojetEvxN88uMDEMOb2jBKVsrPKglSZtQp7/PMB1I4/ZTmHV2iPcsD?= =?us-ascii?Q?+RvqLYbk1hkHduN1uogA8hgJIJvMfTw85nNCUMN+122+fVFnrbv6JXtK3c8N?= =?us-ascii?Q?yayun8/BFbc5M9v/CjJJtvjmD2idSC4XkAg536iyRn5tBzAe1mOPevGT2zmS?= =?us-ascii?Q?bUWxCXvcB4+re7/KWAoDWBWQBhf1emR02qeyTISVfFee+IdiTAVX/yMyVYzy?= =?us-ascii?Q?eBvbUUTqNGEiGJQA5eN0HyeaEwPrje23bz33W6kZOePwqTUkRLb5a8N9E0DR?= =?us-ascii?Q?I1FueaEizU+6hlpskhRsEvr2gi6Hp3+YauQLxxNaFr/6c5rkDWytzSDeiFPb?= =?us-ascii?Q?mhS4MWrGcJZOTTBHz9B3LNAlwIziWfX6/AO7Pi8KudLzqu02Ud+LB5vPz9MW?= =?us-ascii?Q?j4HBb+1jMB1zi9l+eY4ndL1es7YliDQ3VkvzYUkoGAc/op+IEaaodfsp7CVR?= =?us-ascii?Q?XK17VYPnvqa94F1wcitR5noBlejJRZOV6bZBFVaQsRA+4NbCaTCvzJCI0ZE2?= =?us-ascii?Q?R36FOdV2aH5mi8qcg4sNE9/Hu3/b11n9jRCEUcoaLQLrH7Z+rN7D3dp8NR90?= =?us-ascii?Q?DWh9EJWaJ9d8/qGzvecEuz2XQrVkVg543ugIzv1+sffzphnHXEvcHLwoeQoM?= =?us-ascii?Q?JuEgplseifBFKQYKQhjGonIj2LKiL1V+TOoQfNG/fYEFG+g4mxjh102bjrN6?= =?us-ascii?Q?F2h03UDu3qAzBWTyYjZsf7P03I8ZXM4VQ0GrL8fb6pVu7khO7YzS4lKx9hkA?= =?us-ascii?Q?N4PWZv3bmjLOzH6LLA2puQ5KAlUTPN+I+yUXVyeZitICnhUuyUsgml7V+fTo?= =?us-ascii?Q?VbCSnA3RdnA0xo3b98VmG8842pSqJGxOjtb42Vw+dYzkjnsuVoVc7f2YbfeU?= =?us-ascii?Q?1wigH12j1fuCfWoTs48401UOBD/EssI500jfdwXZ21lePS8ZJtT1eNKbsowS?= =?us-ascii?Q?KlnBMu6sq7FQWFoCFTt2J0tjFGtAsoadBbTEU6NiXqww9cLAVtY3zAg=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1449; 6:ikUZrCtyskUY0OWJq2gsKU1nfkra38GO8d4sFeW3vnNfdKKVI4pq7qjtQZkOywpO1waZzB7mUoiXu8MQxAMfQ2j241xt6canmZxeRd4ERDqz5yPapoNHVhDoqiQU9b8GtVLQONCfMsCmfCdnl6t1HWnnoNBsH3Pd4amXewu5bPLhwgmUy6ljqInt3RCLV7Fm6atHwpnOpH+NrreLid7DZFtuem0GqHKL1VAcfQz3ncKWSENlNi/lViz4gTCSrrOSDrFBy5j9gVV5L0fZKHdL4FW7y8Q42fiiHUcaQl7AZrNgEvOH9GMzlNGkTB3+9+DaoJb+KN2YEtaamKzY5BS4Xg==; 5:NwnVRvbrgeMgDvHNF2s4DLJVb9F86HrtScv33UsRi53Tcc2An97Nydwvq/Z77o6Cyq11AZXliGKXp0gEYIaLbw+JZQKRtCvHyWjaO6QUQEf+moWnau/P+TCQRUm/NaRuBWk3s43DWMXQ+xuGSuCQAg==; 24:MNl5c6bBO2KYo0VgUIXwxhm21VKbCIFH8Y7nyOX1X+Re8kkCBs0Rqla03bEUzIn/ztgmgRpjys++VBlK+bhu1HanmEipRwCBzDCgSmifkt8=; 7:Xo9kLASlLb54MK59TehZ7ILGqrqat7wAbuxSs+/JZ4UsvvcFN0LtGvQGa1PA5WEalVYhBeBrxkZ0A3hzJVH8fEAmRkHwl6/+oO61omo6W8v0VaO04Lilw6TuKp4ciPgt3ft/4UOQaqThjZXhFBZDnLzLLhKRHuNLANRvQ5/54qF6wPE3e3l3sQ/LTQ0ca6OmIQI6RsgLCfFPI+M0WW7TQaX6sPOHwh7druM28WYpWqvp0KG3nJ8Xpquj/u7WNlvz SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1449; 20:lHVjX3Pa+LNdU8NM5HUYRdSA9sxrjkrO6qNM/zIZ39UpoFR+9A9KP3W/0zFPr6Bb0GrhrjLHj9mmtDp6iGy2yJzMFebAnpJWm9p7ofKksZPb4eifA35paqYaP66cXvT1PqjiIQbVscTiPbEonH+vMSd+XvKQF+nVrMn9NPHeKqw= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2016 09:32:54.6973 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: PS1PR0601MB1449 Cc: linux-renesas-soc@vger.kernel.org, Linux-ALSA , Simon , Liam Girdwood Subject: [alsa-devel] [PATCH 147/159] ASoC: codec duplicated callback function goes to component on wm8983 X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.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/wm8983.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/wm8983.c b/sound/soc/codecs/wm8983.c index 0c002a5..9609fc0 100644 --- a/sound/soc/codecs/wm8983.c +++ b/sound/soc/codecs/wm8983.c @@ -980,12 +980,14 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8983 = { .probe = wm8983_probe, .set_bias_level = wm8983_set_bias_level, .suspend_bias_off = true, - .controls = wm8983_snd_controls, - .num_controls = ARRAY_SIZE(wm8983_snd_controls), - .dapm_widgets = wm8983_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(wm8983_dapm_widgets), - .dapm_routes = wm8983_audio_map, - .num_dapm_routes = ARRAY_SIZE(wm8983_audio_map), + .component_driver = { + .controls = wm8983_snd_controls, + .num_controls = ARRAY_SIZE(wm8983_snd_controls), + .dapm_widgets = wm8983_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(wm8983_dapm_widgets), + .dapm_routes = wm8983_audio_map, + .num_dapm_routes = ARRAY_SIZE(wm8983_audio_map), + }, }; static const struct regmap_config wm8983_regmap = {