From patchwork Mon Aug 8 09:36: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: 9267535 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 0746F6075A for ; Mon, 8 Aug 2016 09:36:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EA49026490 for ; Mon, 8 Aug 2016 09:36:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DF1992793D; Mon, 8 Aug 2016 09:36:55 +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 7894826490 for ; Mon, 8 Aug 2016 09:36:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752014AbcHHJgz (ORCPT ); Mon, 8 Aug 2016 05:36:55 -0400 Received: from relmlor3.renesas.com ([210.160.252.173]:63139 "EHLO relmlie2.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751158AbcHHJgy (ORCPT ); Mon, 8 Aug 2016 05:36:54 -0400 Received: from unknown (HELO relmlir4.idc.renesas.com) ([10.200.68.154]) by relmlie2.idc.renesas.com with ESMTP; 08 Aug 2016 18:36:52 +0900 Received: from relmlac2.idc.renesas.com (relmlac2.idc.renesas.com [10.200.69.22]) by relmlir4.idc.renesas.com (Postfix) with ESMTP id 00BEC59F67; Mon, 8 Aug 2016 18:36:53 +0900 (JST) Received: by relmlac2.idc.renesas.com (Postfix, from userid 0) id E25472806E; Mon, 8 Aug 2016 18:36:52 +0900 (JST) Received: from relmlac2.idc.renesas.com (localhost [127.0.0.1]) by relmlac2.idc.renesas.com (Postfix) with ESMTP id DCD262806D; Mon, 8 Aug 2016 18:36:52 +0900 (JST) Received: from relmlii1.idc.renesas.com [10.200.68.65] by relmlac2.idc.renesas.com with ESMTP id UAA22823; Mon, 8 Aug 2016 18:36:52 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'";a="216938755" Received: from mail-hk2apc01lp0208.outbound.protection.outlook.com (HELO APC01-HK2-obe.outbound.protection.outlook.com) ([65.55.88.208]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA; 08 Aug 2016 18:36: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=dOD23JduthzeTVNRfkXoQx286AbAgPuFK8LDRVXLNYc=; b=kK8ND9ygGUKQ8nRB0ixcekEylzhWAPT334KVLTXgfDkQZrENqcozXPyIvUHWI9jy1qsqjnszLj/bpHWNpKkfD2PYwrVMPB2t/liTOWgo1+yr6E3Y21acYwdceLIk9ojRjgLoLKHOVL5UwJXhJbAlEKZgWSKhCM6wyDCIYtGFANQ= 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 HK2PR0601MB1443.apcprd06.prod.outlook.com (10.165.182.149) 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:49 +0000 Message-ID: <87invbzk12.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 159/159] ASoC: remove codec duplicated callback function 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:49 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: OS1PR01CA0007.jpnprd01.prod.outlook.com (10.161.225.145) To HK2PR0601MB1443.apcprd06.prod.outlook.com (10.165.182.149) X-MS-Office365-Filtering-Correlation-Id: 0b5e1516-ea58-4e54-988d-08d3bf6f8624 X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1443; 2:sp54AJsQumZtSa5X3oRcERe2O2yY/aYj5saq2dNoL6Rk5rVSclvo4Zo6y/RD3cOxRl+Bw58H81Agtb7JG6aP7Vd8YKa76sTLqV96Z7GmMH1zaUPF1NdxbUvYM/LukVMKc79uCa0Nfx47Acyi7jCvffaBCXYLl0Lb1MBseHiGM9kUYvNikeAhMW7A5iVZPWN8; 3:V97hupcIH3h7gJvfJceMbbL/n/v2ZK1fDPXkaE/yLj2v3b8w3RQkHEj86uVyJHgPd0Yn73F1uhc2uoXwIS49gQE+zj3rWVjd9vrOQFNxjv42R+99yLljWKgBmbpcPMdy X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:HK2PR0601MB1443; X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1443; 25:q50GfBZ1dX4ACM2nIc3xKUC0j+WMkeUEO4kqaBBkYN4AtHgHRNrzeqgS2gnkY85TaVvArL8I9hFH2b+Q5GaGy4maSULiecxrqEI6X5oOr86YINpoCa+8wBdC5hVwDAAs00VwegjDARzrhzAvYFU6CMjOBx8BPdsZp2s/cPMCdZGW4RHBjebPXhXjTgln0irHx2YV2pbXi5y0xnt+9Gw28X18oqygpXECfZ6c1tFigBDgWKW9z3TBwf8F3Nw0CP78fQeHE8CrtxrwXfDrAsavkUIhyoxhD5oB63gA4SULHg+udYyMy6qXNrHhvdIfjudc0Xg0rGcWxPDg9T+lBKc6K395SgwCLktEskLIwegcxjLKQVqte57gGktexBFAcJv1KbLoZKVpodgg7krYKij0zm47JpW2nJilOoIDPoMHzQtGRqzePBMWmO4IVAGxxLD2GCztmDmAHuPXH2Ox7+6926V9FjFaWSoqK6FBnPydKE+VEJLJznOYvW+xDu1lULHOj0WYvJySOVNdV+miJKoMgGsBWm2rd9V+juMpIl2K+/1LilU7MWRzlFYPyOqG1RaSTVwxXFrbnH8IMfLvuY0lFreoef+wR6u4lV+u3aHyq9T4FnkJi30kUC4GAu1thvMQhPa1t7huKKrYue2vOvIgOBxQ5lRTguxrJWiRURYdoFOrw+4nihRdWuHNcYYuGlpB; 31:vlfyL36G83JPkrYtBxFbEX3EPgjwE53/JeIvioc2aijnAYNhu9HSfA3LlzobKQkYMXXDGXLlczkJmEsEARyk9kyugWlQdqCFg0/qS/PvSo02xWy2lgC6PlV3CL3fda8zdThFmd5dz8XfOMLf3NtjH9qjxotZzEDvPnnCZ33yYB9bSAUT8JMzePhD/Dz8dBgodknGm1u/R5d40lXbiQ74CMSy8u6z8Mb9fsa A0TMzRc0= X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1443; 20:yLkzOadBZUFt/AJOn2og4ofjsxMaRtla1Jf7CnLkrdoeyHSOJWfllDx5o+AQPfk0XHQLNOW9hUWYFfyuL/lfDb88927fIpU1p43nsGYidErue+oyTbsIUvwms5ifIvvuugpDbRYf7B4prbbnULrV2ueDvMXNkIgcsrKFHFH14avwLJMA+NyAzvVqNpa8/2aij92IcVz7++zaDMJ2hF5bztq6ipXz2Ao3dnzqZWB/9q2AFWyE4hdHXOPWB2m5qfyLj3gUVCXJ4hFZsFNgTqSdmbavNy5Ucm5jG6Tb0edgYO1WcsCd2+QtxLwHD872ciKQ7DToeCYWUAxLMhL7B2coSYhhoDxtlRLoYUeh4HscOIwcQA7z3vhv9931Ap15R8GfPYnP0Ltm/2BtOkwbNE32AMcyFBuNHoKWZvX6mPtj3ff86xvmmptGn7G6EdXMMzw9AyNB6nS9rB8VwU5eXOF/VnwqEuQvC8ZabyTCM4giGPt9lugWIrDgGjBYhtd8RCAS; 4:ckfssKK5UXhPSUF2hU2e9BdtdCcRxMwCaJlJwr2gRAfOrRc7vhqZIX8wwZjD8qLcYqOBw3RUSxpnNvNwVwPx1THrCBwpQXZe343HGn+/1rwg0zcecXBjRF86jZPADkQFKWjTi2hB39LTWIFin+T1dvVwRL9KxtjSGvH4qhwbxtAKQtRknuIx4kL7gulZO+LmxkHS3FD4unCpaLP09nQRqMwXyDK2IXqnHq6rI9ga5N/aHYLf8uBEDmrmmzTHMZF80pvar8Tu47GUs8Y5IvkHRViPZs+522Lk0LMfJV3Hgk2h9GO8awR+5nb1m7F+aQGD61JKmDYvzF/DGFuuiZjp+HLJ5OI+paTOdhLrbT5xJTxvCSsXnCb0BrionpfOY0qYzLvaGh4gAMwSl4HqnQM6Fg== 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:HK2PR0601MB1443; BCL:0; PCL:0; RULEID:; SRVR:HK2PR0601MB1443; X-Forefront-PRVS: 00286C0CA6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(199003)(189002)(2950100001)(105586002)(101416001)(81166006)(81156014)(69596002)(229853001)(77096005)(106356001)(3846002)(19580395003)(6116002)(19580405001)(36756003)(68736007)(586003)(42186005)(76176999)(92566002)(33646002)(8676002)(23726003)(2906002)(4326007)(4001350100001)(86362001)(50466002)(7846002)(83506001)(7736002)(305945005)(189998001)(54356999)(47776003)(46406003)(97736004)(66066001)(50986999)(53416004)(110136002)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:HK2PR0601MB1443; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; HK2PR0601MB1443; 23:bgN8jHpKgoe30bnrf6oxVpY2idLvd+l5kiKvhpd?= =?us-ascii?Q?6adinH6joGl21CY77rR20vKxMlcVSBg6F/bKVvUJr0b/SXbcBxhXhP/u9ai6?= =?us-ascii?Q?3QTnH/vwSjW4h1MkBA56nDf9ppJ2elT9ktz1aT1sD9O3LDext5m/iKbMIEhz?= =?us-ascii?Q?zybWf14kLOqRQyTCIRecMekSlMvRw8RbKVphBq1kr8zUv/FnT4LYd5N/crnH?= =?us-ascii?Q?tTaLtmS5XI/Vbux39Qap+pLLxV9kO8yxDXxciA5K3A6nw7bEEGj+JIdyKOog?= =?us-ascii?Q?8dmuTUcjTt6njW6Npr0QDikRkYSa0UE8896BP8zRA6YDxeOBKdE/WVKUxx99?= =?us-ascii?Q?Z+xLoqiGEAIB0ukI84SqyV5A94WTjZdmXqi7YwPIfRs+xj0MmfnwOl0XyZae?= =?us-ascii?Q?djXtS04z9lDjhrXTshnP/7zTRS8YTVHenV6hl9Cg+MU5zWDi/d3BsUiI7pcq?= =?us-ascii?Q?lZXhYBqCtWVQ6vWUrQD3Ry1qhLw4kXrX7edu1cgGuZsm71BCfjyG0WVcKFkS?= =?us-ascii?Q?ipfd51s9gAuOaSbrdgUFn2RyNKp9FsMzxoWEKBYiujY891sfGUcnuxPRcOfg?= =?us-ascii?Q?tUSLE58feQrNyfEM+qPA7Fpz4wM8SvoD1xCvHm9IjkdbBkeuvYmAIxEGNHwy?= =?us-ascii?Q?ecpy00mj/VQ8LuX2usCiTeJgzgb63hnrPf17qeNc4RsQ1yObWBx0VRI2MdFO?= =?us-ascii?Q?19CyvPQhHxYK+/CDEFGvFtvPG2iY3+MioFWWM0Hlby3HnBxRWeBYeSbScO66?= =?us-ascii?Q?uiWRjW7mUnX6dYGJ1pFWZG/WcXsxBOG5wXf6jMxE3t3U/5XMUXrbTsDBC1Y3?= =?us-ascii?Q?XGPht+T2NNjKbd2J7N3wLQlf3MmgKg1Sc2sQaH9CvfFmLfw4lNVqKziWSDpn?= =?us-ascii?Q?WltjkYGKz3bvjFfH491/nFyjHfKn0l9y1B8sAWOVpOYPw1D6MyQTprZvnjfz?= =?us-ascii?Q?X36Uj1iQT4uOlI8A89xJJtRufXviph4B2n66hzc01YCUVVOaLOrp40yPCMPc?= =?us-ascii?Q?gkczCqboiax9M68qI5rWOrwrRKzJ/BwuRi0AzSfhOtGCr3jZI6DqdHTzUR2U?= =?us-ascii?Q?zqXYrDTLRbByUjL8CMUB2jo6j9P9wsm1kVwAiIMgOVs8+W3uyXgMA1CULRD9?= =?us-ascii?Q?MhcNBrzb9pP6rvHkzjjwx88KPX79JpABnvLWcy+QfW1DhGS6qnzAJIw=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1443; 6:b8p5FX8YVZUdXFNGnUIOUikXmYpedBil98WKqgByddopJDdn/BICmQndwgQkn0e/IuSX5/E2gVST4q8nNl/gIt2UsjVPcSs0gxpV+a4JeFsqSxfUfDsdFW/TzidYQ2bvUwsZBkjo8O1dzNdj+IAdl4hYr0ZzEjNdRnDxSxzNt592l8YUuB4kgPUu1arhw8FqK6gaZyfdacvBUgIZ/4vd81/GBJ5wbI8l0JM/PQiTQgLGsr7Wx7FQwH9evyXhY7sacblRFnbVq3/Dqo63NKgVIHmSBkcmDOtOznkynSeRcXmt0WSPWz8A2zXBPjfQY0hKtrnP8bpR692jwvrC3GqeJQ==; 5:5VtIy9AyBIKH4grh58toCY/AIc3NyAvCROPd13bOQgU/aJaU5dwtLKJykV6338BDIMcOpSDu9HkbCu5yok59T1EPoV7k1qcmodg2EXdaET61UOs57b705gZYkqbNZJo+5slgPKRXO1mmTb640jztmw==; 24:qAV7E9jAVfUp6TVmMGlvjjvyaEiGlKJImOkmD5N/JGIWZF7hM+5v7SIoeFn+q/BBKK/f5I+oxkvllb4xBmtfhdwzKwwPQ4WbmVfleTkpgBs=; 7:U/hVUzU4f9goHcWLrooGzl9Y1tNAH1cNN4lriH9taNdPzwGzp12/+C4qYsQAxHwh6VDKZmuyaCA9kg2Ma4UrkGAtawTRIO/Yh1cNnd3yGHymvQN4Y76xnXoCBAyKz85xF56gV8V9lnfjMrt1THOwn3drglIlOK48gyu346q9jTXYILbBgSWnBkwVtowLV9xztlJm6st+7+lYYADTWCVe3V87miYXTxse9Xsqw40Azw1xhC/dnM2yBX14uCSl3Y1c SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1443; 20:u64taHjmSeyPvqF2YgB6VP4xZwh/hoF9jrQ/QcyUXl/p2XHNEbKD1bSt1/crWzplhvmZp6Ojq2ObjxZhrRlrtt7c4Drk/VSDsbiyg/RJoJMYBTh23nBIr7Z3BzNIZnRwO5rZpWbPimjU8teQ6vSzJ9UlEOvI30qIBaAwPdSIO7E= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2016 09:36:49.6607 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: HK2PR0601MB1443 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 removes codec side duplicated callback function. Signed-off-by: Kuninori Morimoto --- include/sound/soc.h | 8 -------- sound/soc/soc-core.c | 13 ------------- 2 files changed, 21 deletions(-) diff --git a/include/sound/soc.h b/include/sound/soc.h index 6144882..5eb2b38 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -898,14 +898,6 @@ struct snd_soc_codec_driver { int (*resume)(struct snd_soc_codec *); struct snd_soc_component_driver component_driver; - /* Default control and setup, added after probe() is run */ - const struct snd_kcontrol_new *controls; - int num_controls; - const struct snd_soc_dapm_widget *dapm_widgets; - int num_dapm_widgets; - const struct snd_soc_dapm_route *dapm_routes; - int num_dapm_routes; - /* codec wide operations */ int (*set_sysclk)(struct snd_soc_codec *codec, int clk_id, int source, unsigned int freq, int dir); diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index ead49d0..054d94f 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -3333,19 +3333,6 @@ int snd_soc_register_codec(struct device *dev, if (ret) goto err_free; - if (codec_drv->controls) { - codec->component.controls = codec_drv->controls; - codec->component.num_controls = codec_drv->num_controls; - } - if (codec_drv->dapm_widgets) { - codec->component.dapm_widgets = codec_drv->dapm_widgets; - codec->component.num_dapm_widgets = codec_drv->num_dapm_widgets; - } - if (codec_drv->dapm_routes) { - codec->component.dapm_routes = codec_drv->dapm_routes; - codec->component.num_dapm_routes = codec_drv->num_dapm_routes; - } - if (codec_drv->probe) codec->component.probe = snd_soc_codec_drv_probe; if (codec_drv->remove)