From patchwork Mon Aug 8 09:17:19 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9267691 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 D6AB46075A for ; Mon, 8 Aug 2016 10:22:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C71EF26E8A for ; Mon, 8 Aug 2016 10:22:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BBF0827DCE; Mon, 8 Aug 2016 10:22:28 +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 A4CCE26E8A for ; Mon, 8 Aug 2016 10:22:27 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 75E982673A1; Mon, 8 Aug 2016 12:22:26 +0200 (CEST) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 092CB266E9F; Mon, 8 Aug 2016 11:41:02 +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 321DA267399; Mon, 8 Aug 2016 11:41:01 +0200 (CEST) Received: from relmlie1.idc.renesas.com (relmlor2.renesas.com [210.160.252.172]) by alsa0.perex.cz (Postfix) with ESMTP id 1DACE266E9F for ; Mon, 8 Aug 2016 11:17:23 +0200 (CEST) Received: from unknown (HELO relmlir2.idc.renesas.com) ([10.200.68.152]) by relmlie1.idc.renesas.com with ESMTP; 08 Aug 2016 18:17:22 +0900 Received: from relmlac4.idc.renesas.com (relmlac4.idc.renesas.com [10.200.69.24]) by relmlir2.idc.renesas.com (Postfix) with ESMTP id CBD6D4F53D; Mon, 8 Aug 2016 18:17:22 +0900 (JST) Received: by relmlac4.idc.renesas.com (Postfix, from userid 0) id C73B2480A4; Mon, 8 Aug 2016 18:17:22 +0900 (JST) Received: from relmlac4.idc.renesas.com (localhost [127.0.0.1]) by relmlac4.idc.renesas.com (Postfix) with ESMTP id C1D8B48014; Mon, 8 Aug 2016 18:17:22 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac4.idc.renesas.com with ESMTP id UAE12311; Mon, 8 Aug 2016 18:17:22 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'208";a="217447199" Received: from mail-hk2apc01lp0211.outbound.protection.outlook.com (HELO APC01-HK2-obe.outbound.protection.outlook.com) ([65.55.88.211]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA; 08 Aug 2016 18:17:22 +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=2bCziOM/D0gQ7legqiJ4j9uczArCvTeWFehfmNuclBc=; b=MoZ4iGH9Vx6tppwtn4reAuL8UwHGp0pqzg8N1QrH8exvmkHgiY1yf3EBoDVgqlKT8t+CJXyL2uMhQPISXQRbtzblarqgKSU9KVqp4lm6F3+d+KM6HkIec1n3rBfSReJmT9CK+NruAW6fehmVurM8ObTRxd7Na7H0Cw2gKOr0oAQ= 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 KL1PR0601MB1448.apcprd06.prod.outlook.com (10.169.69.26) 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:17:19 +0000 Message-ID: <8737mf4ofu.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:17:19 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: TY1PR06CA0021.apcprd06.prod.outlook.com (10.164.91.31) To KL1PR0601MB1448.apcprd06.prod.outlook.com (10.169.69.26) X-MS-Office365-Filtering-Correlation-Id: 1d18d4b3-83cc-4a41-9d2b-08d3bf6cccdb X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1448; 2:QL1sEjsavzCrtqefr9CnA9RQw8H5ItBOIWo6FZ8lBszxSirchsBLScGoIsQYwhZtdOII0dmyS5CJM9eDGAD9uBWIJfz7JiZkZTRxSOEy5TFc7oY2aJahdv7zrvg2voOtQ8oJDCX9ZEiDiOB8s51i0VHqS3cvh7y9N3LmJKiyH7/JZ75QXd/WGx33j2pg9nw6; 3:znwLJnhT4W4jShKiGbYBPR7KRN5hskF1rMuNZU5R6jkTo0vpvbMZLfVvpG6fvKH8y/EVMSLWK4eQV+2hJZAxgYIc/v/5Vi6KMcj1YvGNMkZGAbCJkdVR4OsqsvA98X+a; 25:u6Hlc5pNpS/4tes5qIEHtjw0eTiUd28XUntqI3pkvMNxRlq893G0GzdldyheBcvcg2dAzzRc1XAzABI2sjnwsSXjfn6SUeLnKx5PzTKGxOSO4jXIHl3aQOupsZKfJkMikZc94wPYKgUBanzpZrBlCThL8WjVcTtGLKPwjca7HJsau54w7PuIoxxIokpqPfEB09PdPGTk1ExJci+cVQTomchKwXr/ja4eV+CLs8e8tldsta4IfqONQDpqN7vGdviEmXsjLNP0ncg1tyRBtExFCtyrQQFVagPprLRSLD8PrLEjyDXBbpdJugqFhQcMcL9zJKhsT+NCenYxZ3LTuRaa1GYKJJj2+rP0WfdGX/MvOD+fDY1gEYBaFytKPS2mNG0HDdx1JbF2snIKhcDpqPyvHpi0xqXeJDsw1wfTbrGOV8Y= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:KL1PR0601MB1448; X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1448; 31:vpinGX5duz4psgBVDVKclu4CKDD82e1gOiWxlFU5InxY59PzRbgUtDExMNaLqQVJy5vkcK76x4+236VNYtgo8qAR5f/i0t2PByjjEFk+UlrsF9D4kbRkBiuYTCEC17N2hTpkrpSSMkpAHY84Pr97pN+Df3JCA/p3lJhTpqpEIqoUztcdELgrif5ciMdoDf6VfpBozgWj+CIgQjXd2PHE9TYRuHlB5qbbIRn7Y02mBpc=; 20:0JqCeHKIGpq9jO91XEsbA8NduHAoh2doXRV6zD/Ea1DQINzYZqj53xYX528L0HzjMNSdnsORl5opsJ7PbvB/VEIu+fQpqYEVuV69SWPbRvTkxKcEWEavLUNbKYm4qeNg6yYhBi4VtTfoxdLR7gbssPTDizI62V5hMXG7pcyLvjtdFErDYhxxz2mweYCqFVdJPqthqEN8nEmMHds8fuix9HYKYCqhB9aQJZQHtg3S2oU5jBxoUN1CNg096LJYuIXg2vaIUwB4VuRaZASdQSjz6spMwRu54TX4aqBB6O2Vu9FtBQSvrUR3aHEaqDSLOgDAXNxxiletwuWzQUNsaNhk06gBmtT3UqYQtfCHFS0LvZOy6qenRQVmQafU0vWZpOhDgHfTxzf0nmumrBoZCkPRI2ZqF4LOQPo8Vg8b8U9wrBBBJdD2N0rblD4htuB8oCXIJCnpWZltZ9SwaGr1gOntSS6S0bvejULImbhpF/90qdyF6/TWi+WvHt9m4htpFgbu 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:KL1PR0601MB1448; BCL:0; PCL:0; RULEID:; SRVR:KL1PR0601MB1448; X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1448; 4:qa9LscSzHGOvVytri48afbOXrzUgbP7pnszQlWZRlQDsnw8HcrUO0ubv/+wlL3OPYMrJGjLpVYATy5Ce0751BG5oV5cwfzwVnD3mCY6fBoKWDMadtz87Mj652x7fF3lyI8ZA5aPd3dEfnyjy3qS9VvZu8/B4zKbLGl0FtRpZ9JuJtsbXjNgziGNS7cJfS4THtA3P+Z24nzkEbGZQh0AjYMsrWK9ctBC/D0sCPxfT9rWVKVXQu5jvq/Qpg8NYHbyp0uA36A+1aGkFJl43TSkUHepCw3g20WD/Scth1Ab8LQ2J5Qw6GjjaX/+Ny2P3DjfrmNVNtgAYHVSgWCKwcA5FriP6u9mG401SkScNhZm800hIDQ4WCKzWQLghjwa4k6RqctNfkb3vA7CX4BABRpgqUg== X-Forefront-PRVS: 00286C0CA6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(189002)(199003)(229853001)(77096005)(105586002)(81166006)(8676002)(81156014)(586003)(86362001)(305945005)(19580405001)(19580395003)(7736002)(69596002)(2906002)(83506001)(7846002)(33646002)(50466002)(2950100001)(47776003)(42186005)(68736007)(101416001)(97736004)(46406003)(3846002)(189998001)(53416004)(106356001)(23726003)(92566002)(66066001)(76176999)(4001350100001)(4326007)(6116002)(110136002)(50986999)(54356999)(36756003)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:KL1PR0601MB1448; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; KL1PR0601MB1448; 23:zDO9TG/no79JjeXfAYYOHvkDGM/+J8ytBLj0AyJ?= =?us-ascii?Q?blGFP8azDusEX5eR3VJDgmJcFklPPVHu9F1WC2IwMLd0eyB11EPV7Q3a8rqs?= =?us-ascii?Q?CssY7DZ87qOgSNuJE6WuzmPJvmWpmzp0gHXTQV4siFHP+ACL9/Unl5Muh4qT?= =?us-ascii?Q?qIIY9noaOtz39mmM/PU/9KYLylk5b5QhxM/MPV00qhfpKgrmV1Lhp5onNRgW?= =?us-ascii?Q?caMFj7eqjJbWoLjc3OMsbJOHoPBHcENcM+Vfdzcwp8euBGOLCBtqtjxd2VKR?= =?us-ascii?Q?s4qzJr67uHGtK5fz2GwgegXP5l7Px5ZKW2uiyGaFzf0BQ1ggn+ZUvmzlssGv?= =?us-ascii?Q?87oZn5zojwdd7Xdw1IDs2+vxX3P/RkQPL82iSE7Z8yatEgltpwLevsIvFl6k?= =?us-ascii?Q?U297MEMYvVQXl7uAQXZbyCShXFxFkWQb/eyLqf0SdD6p1ZLaysPYjF9evp7D?= =?us-ascii?Q?G0W59vaNxHGk3o0M4wU7TguYjpPYdDxXLj4GnLtf0wC1mkUAx0AqKcN9UPVI?= =?us-ascii?Q?E7v828FF741qSDGnLFZ8Wsf1HuOQ0dyq4h5VmZWSPAb0+WKuzSBUAe86NCco?= =?us-ascii?Q?k6E+EbZC+fBbO21YMM+iUNx3GV2rYWJZLqHesEQ+6aU0CRZWrC6W7qAW+CJx?= =?us-ascii?Q?RH+AjvZiQ9py9eXfzFsENCSj4ONvAAOd728i2GIIpH02+nni8sK2HEGV7474?= =?us-ascii?Q?K75xpXAOZT2gZPnkU4VYgV+UaSSI7guRN+c9YSd6UhPGU8rak+RcUnKhGqME?= =?us-ascii?Q?8emoTJzHBdj0Cu0NihuBM5/+rnSiM1BGn+NN+T2P9SIUJMHf60z4/6tKdavB?= =?us-ascii?Q?pc4yw91WHHdBqsAsac3DpLvFtYrZDNrbwgSQf9iV+givkXWkPuVqsqY8PH78?= =?us-ascii?Q?qQ28OKO3wMnoCka4ZhTa4i2rQRQ7v6ss1OTldhimRHJ2tgMNgcz5e88Mdz4f?= =?us-ascii?Q?OEXYooPZQmr8XR/rQ0UC4r+2zTDRNMjv64QwreZpiwsRiNnMOe8p0kdMs4JL?= =?us-ascii?Q?Ox5C0S0QqFhQBI3PV6L3xM1Io1tKlmRnRGZK5hiZAU3769bs42nzvMlqmtYF?= =?us-ascii?Q?goHJ3RuYjJA8vrjaw7udaGqxj3QbP/lhDjFfCGXi8/d/VhbSPFpk0VWpNlkw?= =?us-ascii?Q?smhS26RuOj1AnsPOdVkYKUGlUYeC7Nq+JmdTDow/4sPScCCxXDm40hA=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1448; 6:JpEsjkJsO0dkw+QqT51RQ2O3/NY9iQrGMPOzJxu0iT/SzkPBoRjXEDHa168HQbBZwMLDPKPGNNmdt+Lxp2pKIAK/Q23s+vwlHXNv9ZFORUM2zTteyNonLBuhq9+Y+MhP0F2TmdcuWAof2S6dsUghG10y+8kbrOuR3qMV4ipqfmIDAL5zvENyEo8YVWROdhBD19c+cm65kzBPdIyReOlVgaoq7gcc/Z/PIc8ZfaUyuTLYVKL8zHwOk2cTLpcx0Ah5GB6azexhG98zoNC8RMW+maunsrBOuyGPAciiNyHaddGPzO/hF8p8JnJGNuySOqNwi9S0koWuGzPa/uVq8OHmpw==; 5:x/sec9qKi8eDlmF6lBGllUr9FHc5ndtoFCKyN9x1wdN0riEvshVbazdN4CQgaR2nNhaTgDFqpzxPj46kqlfCOQBGXpNKrl5LgfL4opyx7vBdCo3RwyYdNZU6rNqhpUKcj9yI9tONsBmAiGUzn+TBUg==; 24:pscQPbzhJ812bh8N8XO+QawA9tfmIiCsv1+id+XZvYwCbHIpSoP6qFiA9Bftb5s2GEu7BXA9PGCLCh1Gp7ENO3kJDg0Q+UfO1BUHaoe9cVY=; 7:i37JOE05nsXPFQrsTvX888Qy3wUGUW/K0pQR798Nz3rO75c0mNLV+WQxagvbc95s+6pOjQDMP6E5pcV7dh6n3QocZc+1ZtP93B8flhRRheMZsQvk25B1llUeINn4YVbWC0r/5hReaHPQbTXjS1FTg03tJVR4LGw0R92ymS57VVQlqrSEcfpIxngma4qcCYe32My6S0ZeaSMzt5rkKEhwM1GEl0iiBenJiKxci8EfFecewpLnFE4P+j1viTanPuBA SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1448; 20:ZG+dKNQQ42cG8XOkJ0+H7t4cXJzu6kpdqJrApVUPPrhoNZcoukajbgPgIszUlV3LPTtb9pQJjLcgAslzRGLL22CN1mO/Dg5E5NhZ/A7kEsFMFKbNK62RTmy3MePyLhlzGd1Kgj3f4KSXEZvKAvel4tmqw72yWUv7BPIct5UYlbc= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2016 09:17:19.7594 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: KL1PR0601MB1448 Cc: linux-renesas-soc@vger.kernel.org, Linux-ALSA , Simon , Liam Girdwood Subject: [alsa-devel] [PATCH 096/159] ASoC: codec duplicated callback function goes to component on jz4740 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/jz4740.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/jz4740.c b/sound/soc/codecs/jz4740.c index 1f5ab99..0290fab 100644 --- a/sound/soc/codecs/jz4740.c +++ b/sound/soc/codecs/jz4740.c @@ -298,12 +298,14 @@ static struct snd_soc_codec_driver soc_codec_dev_jz4740_codec = { .set_bias_level = jz4740_codec_set_bias_level, .suspend_bias_off = true, - .controls = jz4740_codec_controls, - .num_controls = ARRAY_SIZE(jz4740_codec_controls), - .dapm_widgets = jz4740_codec_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(jz4740_codec_dapm_widgets), - .dapm_routes = jz4740_codec_dapm_routes, - .num_dapm_routes = ARRAY_SIZE(jz4740_codec_dapm_routes), + .component_driver = { + .controls = jz4740_codec_controls, + .num_controls = ARRAY_SIZE(jz4740_codec_controls), + .dapm_widgets = jz4740_codec_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(jz4740_codec_dapm_widgets), + .dapm_routes = jz4740_codec_dapm_routes, + .num_dapm_routes = ARRAY_SIZE(jz4740_codec_dapm_routes), + }, }; static const struct regmap_config jz4740_codec_regmap_config = {