From patchwork Mon Aug 8 09:36:29 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9267531 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 C48EB6075A for ; Mon, 8 Aug 2016 09:36:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B395626490 for ; Mon, 8 Aug 2016 09:36:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A872A2793D; Mon, 8 Aug 2016 09:36:36 +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 28F5826490 for ; Mon, 8 Aug 2016 09:36:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752041AbcHHJgf (ORCPT ); Mon, 8 Aug 2016 05:36:35 -0400 Received: from relmlor2.renesas.com ([210.160.252.172]:26017 "EHLO relmlie1.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751158AbcHHJgf (ORCPT ); Mon, 8 Aug 2016 05:36:35 -0400 Received: from unknown (HELO relmlir3.idc.renesas.com) ([10.200.68.153]) by relmlie1.idc.renesas.com with ESMTP; 08 Aug 2016 18:36:33 +0900 Received: from relmlac2.idc.renesas.com (relmlac2.idc.renesas.com [10.200.69.22]) by relmlir3.idc.renesas.com (Postfix) with ESMTP id A965452B68; Mon, 8 Aug 2016 18:36:33 +0900 (JST) Received: by relmlac2.idc.renesas.com (Postfix, from userid 0) id 989D02806E; Mon, 8 Aug 2016 18:36:33 +0900 (JST) Received: from relmlac2.idc.renesas.com (localhost [127.0.0.1]) by relmlac2.idc.renesas.com (Postfix) with ESMTP id 7C6712806D; Mon, 8 Aug 2016 18:36:33 +0900 (JST) Received: from relmlii1.idc.renesas.com [10.200.68.65] by relmlac2.idc.renesas.com with ESMTP id UAV22615; Mon, 8 Aug 2016 18:36:33 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'208";a="216938736" Received: from mail-sg2apc01lp0244.outbound.protection.outlook.com (HELO APC01-SG2-obe.outbound.protection.outlook.com) ([65.55.88.244]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA; 08 Aug 2016 18:36:32 +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=pWVDrt40Vk1h49D04E1jp7cnyGpzFafVTcZBJ8M5Bis=; b=KNdJRDawstFXt7adpdHPaEE27J/rACoA87RvjYJX9GhizYVffq56qOx+6SQTPzB9smjAhlg9ubPa9b1t2obVZEcjlc6SzO3z/Is93xXNauSlS4gvgsx50hxhus6Zw9M+CZEwRFRLCs5vCxLRweqC0jq8/bnuv9w9Jvv+Eh73zwM= 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:36:29 +0000 Message-ID: <87k2frzk1m.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 158/159] ASoC: codec duplicated callback function goes to component on wm9713 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:36:29 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: OSXPR01CA0036.jpnprd01.prod.outlook.com (10.167.143.168) To PS1PR0601MB1451.apcprd06.prod.outlook.com (10.165.210.155) X-MS-Office365-Filtering-Correlation-Id: 2d6a46b8-ed97-4442-5ac0-08d3bf6f79d2 X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1451; 2:bPBw+ycLI0amG890i3zxN9ds7fK/G0fHSs9J8MZtNRtL+zJKlBBgBkVPLoii+eV3hMP71qblmru4Ls3AoBTAxSznxvZE35bTB1DSWiRb8I1d4N3KTIKLnYwEYAhAIQkNGbEiI37KccTZuwROXuRhxxZNeUQB/04SIaNL7Tr2iKfIQ2SPh24jwH22g/3i9Rh9; 3:1XJsySPq2irDGz5YjSYxz5VOfHeVsHjNXNTtDQLfol2c+FaTOEZ/vhqlYzupVysTcLggYIfDQ8nda1HuT+U7r7EpbG05sHmDvEFXvJG15dB57ahpBFeIi8swrDzpTF8c; 25:Df6sJOZ9apeffH7BSGOupcOWHKDEmNQIra0u7zGqPyf1yER5dW+j8ZaGJB4eNRxTDulf4OqWs08ihtZxBoKlq5AqJwWtL/zEyvhQRJBuV6QALSb77HNYeby99Utj3GLp76sRb0FGm0ZVsm23tYJSEaQoeobvdAj6WIIQK9AbjzkEdbtakcRuBK2Gkczfyf380CqTNOl/iAEzQ05NjTnYNK6lEeb8Q9nP6PpVdJjQaPMuf8Di65kY5NXfRcEVuUObGvnrA5MXffkQYnhaaz7F806wgerx0qG5Ucjqg2f8OEXRz9NHoGMQmdL345h/LkXXFRPHJyhTS946m2sX+a2xULbHQgZsCTlk5SN6mwdbj6LATiD2H1q90+3KwGzPmjWOfQNQadEyETklABvhMV7JdIyNbcJLRPf8hJCG0W7ce7E= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:PS1PR0601MB1451; X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1451; 31:+JqicXkVKzgfjZIMsEqBSAqmAkU5AzQ7qXwZ0elEdKdAH85wWW5nlzvH1kN7rONaKWiveLvlHmchBATwtJZqEpWTD0wePNsjrq28Cev+8LhdN3w7laZKgLz1zooWhK3dudtbFgi9jmL+bix3yeZpBTtS7LDWoqekVnbgqIJs0eJBEwdYJ0pRaCFdmyEO53Zp1R/xqhxrmxwH/qIKTkVuFl/QuM+UIDC7I6l1BQ+k9uI=; 20:SEyi60wqHwzGvGD2P5K4gDinL2gR8JP8b/75B8nw3vMU9999vZ+NNLn+nyZS3ZPC3fO2MYlI1IBYpHXFFPBDE8uh3MvdZDERNDT/NMhF0dds9Gk65lMeUzV2hlmUGMoF8sKS0JCEbYfbZoK53ptxhyQa5ffysIj9QMyhhC9zXyUu+sOWds/pNa1dYqtcua6D+q+D//kpsI7YgjWZ4/EsjtvZzOE6NkIdUHMXu1Vf9FLXiSS/W2K1Dqkrxcra5QTMwgMxeEm1Qi+VzraZ8SJw+XKS+0jWm2pInx+RUY58cSD2mURKLGcbwwfa+savs1eHn/JgRtWZPooFTKCv7dfr8FgC3hNn6NGvZrE2eJGvePhcqUHGonkChceFypBzvYB4XANCB6c4KBIFGJgrAlJvN6cpTxD5wl0WSoXTA4T5soY+YWgDOWoRXQTtRgiWzMOMUPYH2ghvpOfpuvzC1NnVrF0QwYPpFDVKD3pFpQIB7Lk8Mt8lQR7ucgBXy6ArDNH7 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:Y8zuSxZGKU72dipUT7Ac/Ma4vtxsiYZ5/5560o0uLBZSMsfuUNANoDhRMLRaOCCuwgdkwg3TaKhzvjjHQT4xkfJfTVi8H5n/NKGhPAiexoU5Ea81Ur9gla9+mpjwWq8753M8G/IA6GULKx0EpJzKkDKoBfsspmiVu3fATJI4IjGVkSG7WFVhnF8bquPuTSj1DMTtwH0sXRJNkSLh2A27WYm9BdIVuJAp2YK6zZz4X2Nf1+CgR9uRbsf62nwXW5M7agdR9/nbuCDrXLx1vfyOJtuIY/6N3x2t6eglFY3OjuUYVJ+n+6ZZOKNHwsPSdn8hvHqLdYphGm/ZMzGaRGrn3d8Jvnp0vTI0I83uA/TvsZ9bkkXkdK2CmkDJniYbue48CaQYMHYNaNI/ZmWHGjpIwA== X-Forefront-PRVS: 00286C0CA6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(199003)(189002)(229853001)(3846002)(6116002)(50466002)(53416004)(92566002)(19580395003)(77096005)(8676002)(68736007)(81166006)(46406003)(36756003)(2906002)(105586002)(19580405001)(69596002)(4001350100001)(83506001)(81156014)(23726003)(106356001)(2950100001)(47776003)(586003)(97736004)(33646002)(7736002)(42186005)(54356999)(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:t+4GUvxbdtbymofUPsquYM0uwzx4RTvW1XfbopO?= =?us-ascii?Q?yfCReEI8TXA4Nit0TV2WO1jizbTtXnOLWSYpWVxhJebYEMISZMwz+UXQ9mS1?= =?us-ascii?Q?rLATtG87KaGlxQ6IWBkp8+Qc4MMkUA8Z3ZRj1yoS6BUUuJ1LAMsxPEgMmjcU?= =?us-ascii?Q?KY4orB/2BqvbQFGwGHZwxTZjw2W3IgzjUcC9uhqhFhXXkU4JDqw6VUIN8VEg?= =?us-ascii?Q?6SlmzYcMGvB1BNr2ERFl9EAubADfjqcl//jMpOiagZDMirVqQpZ5JZosq0CS?= =?us-ascii?Q?rLJVIVkp3kwDDboJAha94QyMXKZuFBApFXQ4hk4OjlcduQ5xzbjtanlOGA42?= =?us-ascii?Q?eBrFuRGb9E6FpbcvGyKtr9v1fiJzaKq9E7oDRtDBirG+ElvF5YIYurFnLSmB?= =?us-ascii?Q?wWvLQ+iS9uH8R95pw0yOgAwMIeZTrgUmUigrx2abDp6JW3mMzvmnXsfIi6Dx?= =?us-ascii?Q?HdPPrQ07zPu9PRxKS4DKnUmCpO+kCu/eZaK+sR8o8mmhfx1mRTl3/oYk7PPa?= =?us-ascii?Q?lWuKw1Uzk8DuwTq6LHGTmaTNInrfZ2ttVMm4KyMtoHE8NEGssCfafiEPemq7?= =?us-ascii?Q?BLkuSd95jYoindrr69topXBupA3+m8V1a7QlgBjqaIyzT4yPOGMJ4vCXEu7S?= =?us-ascii?Q?K940KmZJlFR1mC3bpDoGf2+aYon1eKRcWTDlbNcIHjyW/Y/PsbxCFlrJ/Jyx?= =?us-ascii?Q?d8VF1bYrDzICcd21S/ln+R5X0+p8LIDbC3YlOJPz5AiHoZBUBt1mS7POUC3r?= =?us-ascii?Q?bMGCjU/Ybkz0E3DH82kVOap0Gjz2mwQWZTMaHoGBCs9NSW4fiVvMH+brrayT?= =?us-ascii?Q?rEi0+C80FpRbsotf+bo3sQRn1t5h4l4NUefEG6AbHJGU1tcVBgIyLMAGTpPH?= =?us-ascii?Q?WFYA/dxxNzJuf7TNC6WOL4lc6xCwplqKQojMaqSFQR67fw1beHdSe1hkPEwq?= =?us-ascii?Q?Nshrv/iEZaK/pG10QWBS0/Z7cp3J7fVIaNycRVatNuHSdd93i5OScOkkJYkB?= =?us-ascii?Q?734mitUul3Y/feEmMsJ+OfDXRCBfBiaUk/wosEq+mOSFqEpsBmJ5siYdxi/N?= =?us-ascii?Q?F6AgKiZiEpAqww+tBUDbcKV9C6W/DnPq+D8GK7KZ1Q+xvChdeiwXUnQIyY2e?= =?us-ascii?Q?kkCXFtM66N00+Nc71rodde7RTsDLsGCLuQyJKTYcfO7l/Pg8yHYAtnA=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1451; 6:wCjkedusyyrVmFciAtaR3EVq8ThDRy9OLzgRMVEqZJ7/aKgcROKV+QiyqTk+43pb7/HG7lP0cqoP5rQ5VyZpPtBfu4eI1yo+fqnP8U5FhN9wS4b9es1U8vLlYIOgyw2H015sGsiQ45Z9REPLdFDpnVZIslo7sx8OttShxGy4aEa3UaQOluWp1ps5VdV6lKRiqYVm9NfpLPzhC2ra2HJWLNlrN8g3/TpUrTpH9AUONEmLKIW2WyGR1+RTq2lfxWiRg1BG/x3EDEm3dpT8G/2mi3aMMJ7j2yVFyhbzNBjxJNAXTgJL/4Y506eQtvGHzG6dksree0TVEsOUhFlh7kJ1Jg==; 5:jAJJumKZWN22562rAAsmAMUbuhuP4fnTCu/ih9Z3cuetomdIuydte46a1FuxTVRk9LZ6xvl2hk1De1Xp93Wm3dtmTLhI2Jc0fArWd+MOj5xA1J5ZWBStk8SFUzhALvYABOw1uMc3XosEvr66+ft/qA==; 24:JJRnyI2hMxgIRaE4Y6ouDfi2HYNNFq3USilmCVw85qQq+7ubdou0KiXMXatUV5McsCUdpSqTu1UA+bLNRkjH67yDNv4ihvUOHIjWijxRIKM=; 7:h4mJ3iNtjmasmReA8VrvRxc4m/lA9QcWSkkFZ97PQdDjNXUr5CiQ+AXY8Z1OuftZwclbG6aM2dh1J2N4DeiATOWNSyNH3QyLbLGKxdCvtIe745ddNNHHzT0YRuyJAAb8+6eTKz2Tu0NkhFxASOpW9o40zzXIHtjBdnQuMD5G0W1UVi87PJDw5AeJDo5pv2gUj5gxWYxuRvP7rbCvjALBo4kutDP+JlPvZ3kdDpCaPjXtoRF5Km4Ov1NLf/tKV8S/ SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1451; 20:FiFj1xA0NJ7/cEJDniqz10mGydnSk++qorHt+nNVMr2put9VtXHlk5q4nsA1jlt55rdGW7wnozcktanTyAG+OnHd42lYpnxC0sUyv1Isj8gm9X2zLwEeIJgkrtzK1uOBx9x+IN2CYtriheHeMW+xUesho/zQqQDdT1x2E4qDboo= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2016 09:36:29.0580 (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/wm9713.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/wm9713.c b/sound/soc/codecs/wm9713.c index 9849643..255a7c2 100644 --- a/sound/soc/codecs/wm9713.c +++ b/sound/soc/codecs/wm9713.c @@ -1242,12 +1242,14 @@ static struct snd_soc_codec_driver soc_codec_dev_wm9713 = { .resume = wm9713_soc_resume, .set_bias_level = wm9713_set_bias_level, - .controls = wm9713_snd_ac97_controls, - .num_controls = ARRAY_SIZE(wm9713_snd_ac97_controls), - .dapm_widgets = wm9713_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(wm9713_dapm_widgets), - .dapm_routes = wm9713_audio_map, - .num_dapm_routes = ARRAY_SIZE(wm9713_audio_map), + .component_driver = { + .controls = wm9713_snd_ac97_controls, + .num_controls = ARRAY_SIZE(wm9713_snd_ac97_controls), + .dapm_widgets = wm9713_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(wm9713_dapm_widgets), + .dapm_routes = wm9713_audio_map, + .num_dapm_routes = ARRAY_SIZE(wm9713_audio_map), + }, }; static int wm9713_probe(struct platform_device *pdev)