From patchwork Mon Aug 8 09:16:59 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9267271 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 5E49E60754 for ; Mon, 8 Aug 2016 09:17:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4EBF0212D9 for ; Mon, 8 Aug 2016 09:17:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 430F627D64; Mon, 8 Aug 2016 09:17:08 +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 A5A34212D9 for ; Mon, 8 Aug 2016 09:17:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751670AbcHHJRH (ORCPT ); Mon, 8 Aug 2016 05:17:07 -0400 Received: from relmlor3.renesas.com ([210.160.252.173]:21564 "EHLO relmlie2.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751158AbcHHJRG (ORCPT ); Mon, 8 Aug 2016 05:17:06 -0400 Received: from unknown (HELO relmlir3.idc.renesas.com) ([10.200.68.153]) by relmlie2.idc.renesas.com with ESMTP; 08 Aug 2016 18:17:04 +0900 Received: from relmlac3.idc.renesas.com (relmlac3.idc.renesas.com [10.200.69.23]) by relmlir3.idc.renesas.com (Postfix) with ESMTP id 12101520C3; Mon, 8 Aug 2016 18:17:03 +0900 (JST) Received: by relmlac3.idc.renesas.com (Postfix, from userid 0) id 0AE0F1806F; Mon, 8 Aug 2016 18:17:03 +0900 (JST) Received: from relmlac3.idc.renesas.com (localhost [127.0.0.1]) by relmlac3.idc.renesas.com (Postfix) with ESMTP id 03F9E1800A; Mon, 8 Aug 2016 18:17:03 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac3.idc.renesas.com with ESMTP id UAA23363; Mon, 8 Aug 2016 18:17:02 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'208";a="217447186" 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 18:17:02 +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=GSd7S60R3q/SkvuvSnR6Jh/qQJiqS2VNasewOC7foHQ=; b=JZ8qtG4dEZSyJTgwakFV/G/s9JwK0JB/W60iJjuzBjUIbExYPHdhUjqRXXjRmWbraUYKre9r5fzs+p05077zj3m+D0vOMt+hBq+1X+8Fx/W9FstZ0dTAA/wYx4IZfXjtqtsLp0ZQR90j7wIZ2Pg+CXMUHyNX4qa/6+tjSgl8lMw= 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 09:16:59 +0000 Message-ID: <874m6v4ogd.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 095/159] ASoC: codec duplicated callback function goes to component on isabelle 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:16:59 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: TY1PR01CA0047.jpnprd01.prod.outlook.com (10.164.162.157) To KL1PR0601MB1447.apcprd06.prod.outlook.com (10.169.69.25) X-MS-Office365-Filtering-Correlation-Id: d8fd3a16-a2cb-44a9-7c66-08d3bf6cc089 X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1447; 2:tlXTjLoPq4HmocPMFu9w7IUlu2ppFWXc3QoMe4TFRAaUKpVpYF47Wi8youGFSucXhyL9lECUf6sutSLr+KIyI1iDO3otU5AXeOvg5NEFM6qIZFu3rdMRT1xLWh03TVh71nIAxzru89PnXa4b/m9gYBtGBPnDIMcTWT8PS+R0aJYRYv61TtWDkrZ2+HUmMbkE; 3:loCCcAXKRq+gaGsetcgHKakLR1TtRG95+esgBUtOvYqdL5s2ndGTTOH/arPCvyOM/2dmQGMDrvdaHP5jLzPnQboKlTy0KSe91OmK50rwP5QlHJKpQJ5GqpHyFra4tV6X; 25:M84eGiT3Ll5kxyPLaiVgFDrz62C+LnSFcpZGJsdjztfz5bWx5LHOwOeCp48IwiQ2t3dk2E2pIGY0AYH0Mm7sB/soDYnhIWemzcgTZyFsI/HTvRziOshRtafHJW5IdHFwZK7cBLTaa3gg6e5cSFaWw5hAjE8C7r1UxdMW1PUT+lTeSgULeZolcx7YBreIgNAPzUwJeBNnZP2ppAHBcDA7YmPl2Rsr+qvHmP3nFZA2CGaRBu783daBN4kGpdQxNIRvBL0hN2LGQgrAhD8H7KDN9pGb91GYZiC1+P6fqZr+nDqxqFiuZgzYlMiowReIqHhKnQI8iofsh8tPlSymDNA/ntkSpgaFmUR3yYzEEeaXwlxAY+gLeSGe0Hm/SeX5Ym8dm9wzjwu3LdT42pZEp8zdTKjQYDx27oOQxIMqiAGx3+k= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:KL1PR0601MB1447; X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1447; 31:H4iCh961knfj4XWdboZxdZS+5z65/fdH9vY3sQgaLWJknyEi01SEg8efy8T87A/Uf+DowYPAvVHaZSiC8zW1+zLeL188bWTDALOSFNAB2Uq9ycLhV3AvHQnk1E8qN5+LuvYBl04tYmfJGB8fWxTFdGZ0b91tsCxCpBxb2DseU30nDBs+/+6ypciXxIPT/LU+kyu8OB4NxXJCOB5GBcjN5XD5f5QvY1RDhiZb94DTP2o=; 20:WcTe700LYbU/dxtMSqEzzbcz+N91PLftlJt4aAEa8elZmoJCOhz2DO7yShGkHvy+0dSagDAV2UX6qtTUQs/TchLH2hSf28JzyCjLzr2mklLxpBlKjUXB5aFeyVkhsSxULcln41V/qYryHuV2QGl58/MQSQlBSkRcB9t/pk9n6owzhVs0E+eM5/Dr63i0wZpbLISyxFJocY6cRN5jbtKBbvPwKC06Q9c3K2de+qXCPj/sFYAo0p7Lal/Wkjvb+SQ1F1XCPP3cWNawLbmBHvV/69omRANiDHJUD8J4vt1XSpULS7DZh6p8FpmnP7FtwmIxGhKT5ttKw6dzYG0jmaAyCp7aFm9cuLgZqXWXoseVqQAqLq/1o04+irdaM/d72F/N3Dyh18OYUIcD5+hCQnWzUDc4hc38P8Vlt099ca8wcb2IHtOGksX59Ci4cUiNN/M7YFk7HpfiwL3vCKqldXyFcdFZExzbPQzeGLaJxomLMQbswri0ZHOGoidBGRWi/YKy 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:MP3N9UcHaVc6HR/kF2Hz9T3k6QJ8S7shQQJj56pC898R4UJwFvGfNcvMu+nMle25l0FZGWrgoocZVv7/8YhBr1leHUaU0JmFjB9rdRFdQEWFNV2T8HW2rSFw3FAa7tplYV+ZDPzK8ayQqnikh+mAdi+0+VlD61bgPpH8f6FZ22S1ze4KqBC4khFw0U5crElgqNITn6XQdLox6aytPj6YsDAcnfy/KA5PXGS+ymzOUhKa9JonKCTsQJntWlX3uyuAI3J3sEWvHIZH18ydHwq51C36xA+OLMYHD29Q0goDooXDtPzTTQtfS8lHO3fgzNEfEXdLilc4xgHfTTL/C1fXpw0opSm61kqL7wdShCuc3h2jOZvtPwzjXRAgeH8NT1D+/Sqd0uoK0TQsaxvKN8zo9g== 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)(4326007)(33646002)(42186005)(8676002)(53416004)(92566002)(2950100001)(2906002)(19580395003)(4001350100001)(7846002)(7736002)(54356999)(50986999)(66066001)(106356001)(76176999)(83506001)(305945005)(50466002)(229853001)(46406003)(86362001)(101416001)(69596002)(77096005)(586003)(81166006)(47776003)(68736007)(81156014)(19580405001)(575784001)(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:ZnvXNPBVgfF9I8ler6rnDIc8ZRdTifAS1dkukKa?= =?us-ascii?Q?GYs+x8f0qxWRpPgu5qTY8a2W9kymG+DAuUCcBd/tUfrGlYvKRnbn48AX/ZwG?= =?us-ascii?Q?0G5o4F0pWpdVpfce9UrGqNmQqRIz5UInsGfJrJiN1BnFe9yqL6i862VGOF9K?= =?us-ascii?Q?4V/P1L9CqglxZJ+nBQ590+GtQiN1n8eSxD1PSMZNuw2zipg/MfjaEmwNQGfV?= =?us-ascii?Q?+F0KdWFJj5xBmbhpdSV66vPuW2azrDWTyqyTWSgCeGKAuHSnpkcEuBXPBwyi?= =?us-ascii?Q?BD4ZnMBifCJB135vy68nzieWpczvOgKbRPyD56hKJ1yh3iICZkWDKmv4+eXj?= =?us-ascii?Q?hiZmfwrkOPqDQ8PBIYobh1H8fWM3slnKjeNB95hE8AO3VYaovPW44binz/ra?= =?us-ascii?Q?hD7YOZFMzuXhNUGucrg++AXFnYFewFhiyQZ2ob8r28ewaelDeq8LVbUJ6oYG?= =?us-ascii?Q?ERCVRQo73G90pLjQzGsWnKT4p4wGYeHtO/N6tyMB3nOEBX4D/T/2Sa9MV9TH?= =?us-ascii?Q?iy3oQEIi9vAhS8jtkIbZDni9dFij5bSs4q45D5noKlRVMqjP89MhX5XwkO1x?= =?us-ascii?Q?YXr3DvJ3k82HjT3Io+CsLyxvrod8fYR/hJu8VQnqB2Tj4Ibuf/LCXD0vgeE0?= =?us-ascii?Q?mk5zMIZrtG/bUsJPcg3leLOAcbGaiqv+reXfEouk/vkuN7755gZVQSOGX6Mb?= =?us-ascii?Q?tKDuq7W+Krdrgvw1XIMC6VajPtTQ5YyvHd+tw8xK2D9djYCDjd7hPMI4kNU+?= =?us-ascii?Q?LW+fCILo1x7iz2O5p1//mlVpbah3r2OXMHmz55snkPvcXXWmBUWB50B+fn9a?= =?us-ascii?Q?NN7U3ylu8ma1iQ38ZMnpLwMfrgQR9C6i2nNQY0KF78riX1goO6kTLIAJyafj?= =?us-ascii?Q?T1dd2vSZrVCCRgGGUhnDGRXE1uUAQIZT9L5t9pJRuV0jKOlWzBFoPlUzKVer?= =?us-ascii?Q?OVupnEs6cKQzyUl7EWDEAa+UbyT5BkpQenKjMo1aDGlu2FWta9gvhp7T4JB+?= =?us-ascii?Q?Eq7OZTHIV7Si0BF2cgor6l09PMoTUbkcArPn+17IcoBg5EWX+0iH5sW1QtI2?= =?us-ascii?Q?gsMRNBFDEWXqt5OHMCOdZkaURbGKG9jivGMC/dHo3wOW9iChRIZC9Myk1FZn?= =?us-ascii?Q?lJamT1OYK1MnFfz+pxJeULt5Ja8NYUay8ru91+KotZ0HkAY+tukyURTTdfx/?= =?us-ascii?Q?M0UwGeDaLYwuEpec=3D?= X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1447; 6:IupnJIFDy483MXcZOxvih3/vpMZV/Fx/Hv5Fuzg1B29GdMxnoNNcRna5+eLuWsMk2Sgz/QOX/u58RjJ4kiSLxqQiHUjukpSmjTbQ1mEoPPBF2CWHmXy2DrOFBfaAqiS+H0KC5ZLN7jNIjL3QDBy4sjmstmGmUobXN8QVmwHfuHomy40AWAO0X3yUcrSslnF1y9NB167CQQz+ire8XVeMGzKS/jkbwRxrspHJhgTbP6w4SwfHCQr9rGYUppZd7+1CVSHTVVLFxz3nCixe0i5CTGQbAvC4Utca5IyiOiITdL85LDg/XtubbpzIyANEJhUAtzEj+1g9IZNMRHWPol8n4A==; 5:kIYO3dT30sdkzpq9ygrMMWAYgxYdj/fgOSU9L3zkHAWxGtbi6BaAF0ajKm4ECVKTp0zBHA2/LpfNO3iR+g83hTRZVl091EKjEvcfU87sSlG8PAQzTrVnLnhKEvsa9FZJBNnFBT7HAIn0U19UywFQTA==; 24:3fTdEP9TkL+6PnxP6p7CXfs42XtQZRvFlgpP+u619gjXlMz8SyOulg2vVVfvUgt8BiEA4ihnpy+mhc9j4TdYkC7wk0u+Sn5yrGHF8Du9owA=; 7:8R23pFnScUZ3MWeCw477bRKys04NSTbqO76+xA6XpAd9WTRWgfj1AG5DuSijPZ+MgDz6bveixUAnsvT2jhZf05cQRs7959ApepDZ7nBE1841miftCvld1XrU7GA36BAgVMfttX34AjouxAxq97TsiaDtjp8lKNR71s1MMSXq0yeslTRC9NLdrG3BqmX8IMkibfhieDmK/2E3V10dBvz2wF70uyB4sebvAzaKBgP6nR4aiPwGFPalF05r9QGURjIl SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1447; 20:vNlv5xCNSPXguavX6niQLKeCS5IPmxM3cC4XKOIBBzmZD546DFIEnpWutjE4MYRSvXGPcNQ7rOHRw1My0JONHgS6VGiBbpCe38pgcZ2SZlLtMleHlX5uRZT2BtxHpJCtIOU8bBTiMLUYd32SDAbVSXmiIHKAPL1Abl4Ot6gpeeE= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2016 09:16:59.1225 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: KL1PR0601MB1447 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/isabelle.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/isabelle.c b/sound/soc/codecs/isabelle.c index be44837..a4b0ede 100644 --- a/sound/soc/codecs/isabelle.c +++ b/sound/soc/codecs/isabelle.c @@ -1089,12 +1089,14 @@ static struct snd_soc_dai_driver isabelle_dai[] = { static struct snd_soc_codec_driver soc_codec_dev_isabelle = { .set_bias_level = isabelle_set_bias_level, - .controls = isabelle_snd_controls, - .num_controls = ARRAY_SIZE(isabelle_snd_controls), - .dapm_widgets = isabelle_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(isabelle_dapm_widgets), - .dapm_routes = isabelle_intercon, - .num_dapm_routes = ARRAY_SIZE(isabelle_intercon), + .component_driver = { + .controls = isabelle_snd_controls, + .num_controls = ARRAY_SIZE(isabelle_snd_controls), + .dapm_widgets = isabelle_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(isabelle_dapm_widgets), + .dapm_routes = isabelle_intercon, + .num_dapm_routes = ARRAY_SIZE(isabelle_intercon), + }, .idle_bias_off = true, };