From patchwork Mon Aug 8 08:48:05 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9267015 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 121CE60839 for ; Mon, 8 Aug 2016 08:51:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 025B62621B for ; Mon, 8 Aug 2016 08:51:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EB4C927C0B; Mon, 8 Aug 2016 08:51:33 +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 0624C2621B for ; Mon, 8 Aug 2016 08:51:33 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 16AF3266C09; Mon, 8 Aug 2016 10:51:32 +0200 (CEST) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id CAFF026668C; Mon, 8 Aug 2016 10:49:27 +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 33B5326668C; Mon, 8 Aug 2016 10:49:27 +0200 (CEST) Received: from relmlie1.idc.renesas.com (relmlor2.renesas.com [210.160.252.172]) by alsa0.perex.cz (Postfix) with ESMTP id D4989266A2F for ; Mon, 8 Aug 2016 10:48:10 +0200 (CEST) Received: from unknown (HELO relmlir3.idc.renesas.com) ([10.200.68.153]) by relmlie1.idc.renesas.com with ESMTP; 08 Aug 2016 17:48:09 +0900 Received: from relmlac2.idc.renesas.com (relmlac2.idc.renesas.com [10.200.69.22]) by relmlir3.idc.renesas.com (Postfix) with ESMTP id 9142152FF1; Mon, 8 Aug 2016 17:48:09 +0900 (JST) Received: by relmlac2.idc.renesas.com (Postfix, from userid 0) id 780362806E; Mon, 8 Aug 2016 17:48:09 +0900 (JST) Received: from relmlac2.idc.renesas.com (localhost [127.0.0.1]) by relmlac2.idc.renesas.com (Postfix) with ESMTP id 7159D2806D; Mon, 8 Aug 2016 17:48:09 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac2.idc.renesas.com with ESMTP id TAM03629; Mon, 8 Aug 2016 17:48:09 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'208";a="217444643" Received: from mail-sg2apc01lp0246.outbound.protection.outlook.com (HELO APC01-SG2-obe.outbound.protection.outlook.com) ([65.55.88.246]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA; 08 Aug 2016 17:48:08 +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=lN8D+9RDFrIFvSbM8V6TBWXNnYJS/ZXiBfR+iQHRy9s=; b=kzWTZtI/Ym5oJINYZsjt0i/ZF4+W1w2wGkr09U0eC2zf/UOmwHv0X+VnWkwWPUpLNe10K0Yz1NddE+8Ux1AXgljv8tsz7FY2bo8lW+PJxk1wKfLARPS5B6vrJJDuh+IbcIGUP76lWJSviTjNAxMCAz2qDHeZmMFuaEbiE/t5vgs= 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 KL1PR0601MB1447.apcprd06.prod.outlook.com (10.169.69.25) 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 08:48:05 +0000 Message-ID: <87popj8xhw.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 08:48:05 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: OSXPR01CA0042.jpnprd01.prod.outlook.com (10.167.143.174) To KL1PR0601MB1447.apcprd06.prod.outlook.com (10.169.69.25) X-MS-Office365-Filtering-Correlation-Id: 532d3b25-205d-4423-830a-08d3bf68b769 X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1447; 2:VAUTGbJ0Wjmb4PatYIlWqOtNAF7XMPKkGLe9oMrHe66Ctvwl/+BBQmkffeOMooAUMLSML4U+XKJ4wTItdtPCZhsHfAHzvF/WKmdjlEcjqaoiKOyQfx67mW2J/+xUoqcWWFnS3Dn2tlrmy0PuuwjDGIe//ZyLJmqkBYybM+nZkjCrICj5HZXoTbsltnAizNi8; 3:iwNQmYxH2fvMLJVNXt0H2jU12SNwK1D0AdlI2/YV9IhRWSAjLWwP5cmMSumSOipFosAucFUQqJwME80Gd8LzMlub2uRcDTdqyBuhYenJm+YW1VOy21lqhzDCsWF5Sq4K; 25:Kf5CRxniSYlI//XpJe+/Z3G4YhDnvTv7wLG4TGCF28fBqq47TptO9e/yaNDFu74nwgTP6HVZAp3r4/sM4FzZNmqgq/bcQSOeifjdeZ1mQ2ldaBHaVLYt/XlA3+CWJKplw9kX/dg9GfAGkVCnn196KtpRg4I2calySjEtN4aCHlvGG/WCk6rVWk7o88uYBKgCuBTFtp0qG+lG2vACmpe8EsqQRTlKGNB1bZfww5opFNx07EDKzTj1KUxaBv+sO5Wwwny7UrLC7h2CrkM0eEBv1ctBXRt5mx2FdDnxmmj4dOGeaXbXeWsg50zOAGyIDaCtDhowl4dnbJhEjvxwq/PIdBvE7bAt4oIC8+k1NZvfk/MeHsNspQYzzOQoQ3RKDEcmSKbwXdvrgbVUA0Rr/yATa+JZjGpLI9jDOA9hpMidV6o= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:KL1PR0601MB1447; X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1447; 31:u3gQ85IyUFplFAc03IDGU58eeAl7uX0n3vyM1LIfBeruew5HTfnj0AgYZd4FhZv77g/YzHqPZ89cz9yVnP+GMTHAkzr38uGcQYkj/lryDY4x229ZmUG9Pe5jLmwEQCgrC/vDvo+4xZLmLPElfLFiJpJCXK3Z5N5VA2qCPMTxChAM6gQgjNQ1ZxEKgDTTQ+Duz/UD4SitGZt712fhLLMSGxU20jeYl92C3rvfc8F5ye0=; 20:y8EzeiVFQG4jgc0fYQRRBbslAtf5PV86l5vPrzTqYVqhRpB0slB7obx9jdGkmp5W1hOeO0xY+Qwd0r073vPwYm+817rYtJn1XccqFnrwaeH1hyrFElafFrp12AeLCeeq/oOejniw12bZpU6zGrzkvnIuGBmI2sjbQP9aE68RcenmH78r3Am+MnhcU5JZRZAML3YI5lB7R3qQ95csEkq8xmbpoFpyEMI+coSJqmmPm+x7C7q3/M/fZW/E24THqyfJOd3D6mbMZs4RSIuNmZVY600gnAZBywTUJJ9q6MNEREc9PkG1V5flT2CgvZX6UwWoIcMCibO5tSHTAl2UjcY1cEv7f+z4Z4nUIOEguGoTS2folZyc3Czh6v1vkSiMN8aez8ocTiiNQLYO0fbCdG/T3kffXKxyChpHlu6bkEgf517IA1SHC0FG2hdF0vHv/AOtN2UhCzeYd7QsWaCS2EvUyn9/ySq7MQenuOVMdTI8LB2lz8+v4ZhYcHG75c74ym/L 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:KL1PR0601MB1447; BCL:0; PCL:0; RULEID:; SRVR:KL1PR0601MB1447; X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1447; 4:CfKOvB60qQbOBIIjFjzyS2T+onl+Hko6WKppaKehTguh+vnZTqOiuY4+YASkA32orstrCQMvMk+ljsJXhTfJZgP4EGiJtCm6H/m7QzyJHJsM2t6uKG2+BTXyuEe7houagtszmxkZ39tjAEjEIzMmzGK1CJYetfTn76t8BdtB64dyCNG9IY5VUOTddcr1Ys7m7pKdyFSMtrTDXnHZ2KRIasUTFzYktkQDDZ389xVBMFDwk3YC9jlnCFz1XhsFrCv6E7dTvWWPL6/1gVE1DmWKs5aOmzcwWIxf6bumXZ6E60ZUDL8761MYiR9j3xhG84QyR56cPogoSJCXbKNcu3x1zHZ/7Vm/9StQjWbCFdG8NWi7NsHXxEXFmLfiZ8rkbh/ZU+Ek7iCm/yAob4tzpz4eOg== X-Forefront-PRVS: 00286C0CA6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(199003)(189002)(189998001)(23726003)(105586002)(3846002)(110136002)(6116002)(36756003)(97736004)(33646002)(42186005)(4326007)(8676002)(53416004)(92566002)(2950100001)(2906002)(19580395003)(7846002)(4001350100001)(7736002)(54356999)(50986999)(66066001)(106356001)(76176999)(83506001)(305945005)(50466002)(229853001)(46406003)(586003)(86362001)(101416001)(69596002)(77096005)(68736007)(81166006)(47776003)(81156014)(19580405001)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:KL1PR0601MB1447; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; KL1PR0601MB1447; 23:HKNoBmpsY4o678jrpvDXvru9GAHe/dTrhD86mE+?= =?us-ascii?Q?hT1qFPYKs7oJjqv7GDBPwpVG3MZuivhh9Wn/JugmW5OIpvwTh1t7waPzhupi?= =?us-ascii?Q?VQm90fphM9E8iNEWkCkKQh2uVJUY37w3VxY479zsPY/Ra2JHS+HIhWOWHksN?= =?us-ascii?Q?R4rW1CASqB6y8nONMmA5ee2gDOiWccylaR04WP60wRtHNw9eS57V3FPTVhQQ?= =?us-ascii?Q?AR9HSPr5D7IZAvK5b2P888TqlwLBaGgtHW0j4pP03NmmkwoNT40DcW8YpDF/?= =?us-ascii?Q?ID2xXkRKvi9Ra8kA0rlClOGZVICUGedokIJw60MSi5y5KkDx+YfyAROUEBsb?= =?us-ascii?Q?kJAM+S8QzbFdOp+ysbaA1bKedyAKY+RWvpk/T0mVNhUFTuKTnDVU5dI0aLv2?= =?us-ascii?Q?QifZqxMH73Xm/ds9xEAdvyXesefaLzKOLPYJTB3B6WK5aj8xUN/UZtOX8a1T?= =?us-ascii?Q?gAY4VspotKLjAxifxTaHQaUnMwCgMEQ5Ntb+Tu6IaTtXKfwcxFgjEFEgG3PM?= =?us-ascii?Q?4FH1ySDkl8VDtrhprNdVK5Sg9B5si/s9hWFB2enjqSCx7Yj6qkCZH6f6tud3?= =?us-ascii?Q?Bfu8KjRH9bN3vz8rB/SkMOZ07vrVmbD7daYs91B1+Edb9lSv1kqLrhB3vYWV?= =?us-ascii?Q?ODeg9jlV2gtRrmR9H2PgdhB8Psre5MlnNQaooRD78pryhyftU25eq+YTB5Nl?= =?us-ascii?Q?fJWN0WinRi9Wg+aIL57n8wcltjQCVOoU+CAxeT6GRVm1kSkOBrUA4tU2UoCQ?= =?us-ascii?Q?j0SUZNjH4I5rAfvDelfmEuxmYEMMp0DXzm1WyRkrl86bVwowTjCMSpVc5Ei9?= =?us-ascii?Q?XEZOONB+ldietBZu4QRa/p2sGZrsywpQag3zl9N97batLA2pyzqkz59DZ/YF?= =?us-ascii?Q?Nv1e9HMWSrgrMgDIJ1LPfRHA8S5IfER4W2Ou2HFD8lz2kAFKwRq7UZUY1Vjl?= =?us-ascii?Q?hBr3w8itZuiFYWNYECIE/EOCQmPnGPASP0SjZjhaEL75xYCz6rBzBxMAoCHs?= =?us-ascii?Q?gIQNvxzgm1lxsRIcCCSwVoEO77jzI7KaK8gsBgjC1xmewOVqmmew731HpmHw?= =?us-ascii?Q?JEEIHEH/CW5+nCn4wydUiYanRHJ0I5/S9Veyeb5WUgywdKBkk1RmcoyEi5Gf?= =?us-ascii?Q?reA8Fo3p+PpeYXci+J6CVCvDcl2jKgaTlhJbTBjL7LdCmkQYuPdNkeg=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1447; 6:lyGDerea81kNOnB9e6JIGAXOCdkRxnkuCGEVhhI3uULG08XC4hMOPtdo6Y+yfsICJ9PFiD5VX7LrblTMUtYoeghCEVlw8fWaSWmZPaO5ZXZzE2//w9FeevZrcRYXQS9YvW8U5qP8RksXqMw7zyEDNBx3roVwpZxAIfrytmf7aRFn0f0Wr2uUe/V7+dgReroeWmlZSI58xXnkoJfEpLmZr6EfgrKvNqZAXa1NN/zvBt/0c5FW7yqqi0V2koPkhNAWrpOIiatL/iaHD4eYlcNxu0jBfNP8RKDTzbZdt+vLI2nm/9apKq6+gfJKqxXWi8UqL8qZNtEFQLkGub/1hFz8Tg==; 5:XNJyIpTJTGbMCZ7KavqSbgHeT6aC/9r8hRrYhobabll7nHpFsc8yQho1yzKCOfpjBuW97HZlWDfBgIIGj2Xq7e7WfG2Y2VFpG9v0jzVsnu/AB8eUuQuoZdmmcDZKtsS0VJ2jAWa/q1OKd367Zl+J9A==; 24:9dBVtMFfNU7d7Ryn0ad5Y6/EEr6cAbvZaMgros1gRaeynFyFz2DUaTJgpiY/0wZQKVqRG8MzmlWi6853Rgm3mb8W+0UU6W5xnvWkdrh4NOg=; 7:jAUpyKWB2po1g1vc0bwxaYBh3r+OJ7fnGyQfGMw+V51sx3o+ev1RBCffNMkMggX12rCxf+7nxaPiEUvOTGa0qPxPLdy6SC2LqG89TcRhp5kDsSH1re/n1c9WzfCcAU3/iGcl5/RMYBYCQiVoyANuvIHv0PbyrLPHm/CJ9MWzjHteyHEUyKqcxIHwLKtbiDOfn34eLvYk63bRorGxAnJIdgis8IlCG8JqS50lbP2744cmjU4uEt4AxuMXtqfTVm+6 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1447; 20:yuvlDZzvS+J9itEv+zVMcmUhTAz+VvW3sp/J6OJaAJGvFIGcIHp5T3ajOmmXHMf0UUmBVe3taCFFZR+zeIwFrahOh3bY1dJ7yyRKlKUlkhuxN5/xydjgbq8EF1OdHLiSSpT9vpfcQI7Qb6Dls8hg+UKe1xKG9xdPQgQAop5LI7I= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2016 08:48:05.6344 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: KL1PR0601MB1447 Cc: linux-renesas-soc@vger.kernel.org, Linux-ALSA , Simon , Liam Girdwood Subject: [alsa-devel] [PATCH 005/159] ASoC: codec duplicated callback function goes to component on wm8974 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/wm8974.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/wm8974.c b/sound/soc/codecs/wm8974.c index dc8c3b1..fbda6e3 100644 --- a/sound/soc/codecs/wm8974.c +++ b/sound/soc/codecs/wm8974.c @@ -681,12 +681,14 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8974 = { .set_bias_level = wm8974_set_bias_level, .suspend_bias_off = true, - .controls = wm8974_snd_controls, - .num_controls = ARRAY_SIZE(wm8974_snd_controls), - .dapm_widgets = wm8974_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(wm8974_dapm_widgets), - .dapm_routes = wm8974_dapm_routes, - .num_dapm_routes = ARRAY_SIZE(wm8974_dapm_routes), + .component_driver = { + .controls = wm8974_snd_controls, + .num_controls = ARRAY_SIZE(wm8974_snd_controls), + .dapm_widgets = wm8974_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(wm8974_dapm_widgets), + .dapm_routes = wm8974_dapm_routes, + .num_dapm_routes = ARRAY_SIZE(wm8974_dapm_routes), + }, }; static int wm8974_i2c_probe(struct i2c_client *i2c,