From patchwork Mon Aug 8 09:32:18 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9268189 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 31C5F60754 for ; Mon, 8 Aug 2016 11:34:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 205FB27FA9 for ; Mon, 8 Aug 2016 11:34:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1265928161; Mon, 8 Aug 2016 11:34:15 +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 1ED7727FA9 for ; Mon, 8 Aug 2016 11:34:14 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 47794269060; Mon, 8 Aug 2016 13:34:11 +0200 (CEST) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id CFBBD267210; Mon, 8 Aug 2016 12:08:34 +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 A87372671F0; Mon, 8 Aug 2016 12:08:33 +0200 (CEST) Received: from relmlie1.idc.renesas.com (relmlor2.renesas.com [210.160.252.172]) by alsa0.perex.cz (Postfix) with ESMTP id AB865267208 for ; Mon, 8 Aug 2016 11:32:23 +0200 (CEST) Received: from unknown (HELO relmlir4.idc.renesas.com) ([10.200.68.154]) by relmlie1.idc.renesas.com with ESMTP; 08 Aug 2016 18:32:22 +0900 Received: from relmlac3.idc.renesas.com (relmlac3.idc.renesas.com [10.200.69.23]) by relmlir4.idc.renesas.com (Postfix) with ESMTP id 5D08059DB8; Mon, 8 Aug 2016 18:32:22 +0900 (JST) Received: by relmlac3.idc.renesas.com (Postfix, from userid 0) id 4C40E1806F; Mon, 8 Aug 2016 18:32:22 +0900 (JST) Received: from relmlac3.idc.renesas.com (localhost [127.0.0.1]) by relmlac3.idc.renesas.com (Postfix) with ESMTP id 32BE51800A; Mon, 8 Aug 2016 18:32:22 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac3.idc.renesas.com with ESMTP id UAU29415; Mon, 8 Aug 2016 18:32:22 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'208";a="217448402" Received: from mail-pu1apc01lp0020.outbound.protection.outlook.com (HELO APC01-PU1-obe.outbound.protection.outlook.com) ([65.55.88.20]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA; 08 Aug 2016 18:32:21 +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=usAw+Ty7NzdqscNtgxtqStt7fPBQX/bN63Wu06F0as0=; b=FqvNl80znO+Xqyr7hDYXLafumdISRapmGdIbZxwgC4m8ik6XT4cZj05NF8j41+Lk56IUvnpYP/qIJ6BrYX6iCxRHY/csDL+/lRYHGRByHpxJBfuIpi4qJzgh6h9otRt0fHc2DvkIr9q53Wn6AE1XMOCI2JawPvDpHeCvSNCtJgk= 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 SG2PR0601MB1454.apcprd06.prod.outlook.com (10.169.106.20) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.549.15; Mon, 8 Aug 2016 09:32:18 +0000 Message-ID: <874m6v1ulx.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:32:18 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: TY1PR0201CA0018.apcprd02.prod.outlook.com (10.164.90.156) To SG2PR0601MB1454.apcprd06.prod.outlook.com (10.169.106.20) X-MS-Office365-Filtering-Correlation-Id: a7c1a88a-d8f0-4191-1aa7-08d3bf6ee47e X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1454; 2:f5XJJWGfpkZqWroXD1zhkyF6oUx7dCjktBJgfvHKzQAvCljrHlfW8rqtNbKTDCh5MKiSEhRl+IuoyrDTRVgX4fSzj9i/Uqylx828TCNMbBFbkuV7TXlz1gUnW7ZSmfakAhR0ExQx0D1cNRZaW0UwyNh5pjf39/qUK+G4FpfjWPx3QMYjwoUWH3iUUTQM0a7h; 3:dyU2eV9DtLogMRgvdTooMPKsH/XvMsK2y+4nz5dOI/ZyvOwxxAx0qXVZOiI3fPQQlXQxSUqlyhT3HF+RRu+ZSz1SB2xK9DmPAk3XmH4gkGmj/bF8UBbbD6170ky74Zzf; 25:qLLbY6YpkdcxGOMmT8KDH5GNuJRngi7D0ZKoO7sXdPCmlOxpBlLKLiYvVp+mIOlrJlieOZPhE2RENFzStSo4Q3Ks28/987sxjoJVQqkp7kSBcXdrM9pAcsJbxb2mJLHygp7VhQepuquIeJy3lJDpYYQwfj6U24kPOOu2pE5xoPJqRPZROb/lArAetWmbXB4Gd8PEGSa+rVpmtWNsbnUWYgsLu6eDSAcz7EMwcItZbWrcXrkH7wurgkrs86b1muEPi4EGfU+QtiXPvgVAuPMUnwaUlOe0Ps4RLgvQUf0jht65/e0ts+u9UlhbxQQsdrWGXDifBOE6n9VUoSDa/moDW93aEnI7AuYDyVeEJs+wcCtI5kvFJPUOF81BFLvUY9uwcxPJRCGjc5hOmmeZtNawOdcxbNNFHuF1UTdZcaHJxFU= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SG2PR0601MB1454; X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1454; 31:xNpjeLrKlctdOviZRhlI3DItBdNHph/C/X9TuXiXQiq4w4xweQP61J28zpNN/u5hrOwCA2tAKadjCdGZNSvGtm7akb47XQ6BI3076ldqDKebxxFckhqdmOLMfRuHP08k1GnznVv0n6qlAIE+IHziJt4LlPajG9K/HrqYTubET+rapU5/UPKU6PsqId9kUwTydmaw4WKE2sErd2GbnekO2k6URQJgKzbfpcGlwurzfyE=; 20:Y0R5PqXUwSpRDMhdYiiECb0CrlDp+5nGeBpWXJKfe/KKFAAsL9YwnYDXgcMQKjIED1+G6GM+YwperzZaDmQoai3bY7eDpKQUF0JgTjjGOGU4OsgmUASKGV826r6xwKfX7E72qdm7K5TmibXZyYmj00kOnsssrJIlDdixdcfi+Z/2KXgTdjPGqcSOYz4+9l9EZjEKS1iq6Me5NOA/OioBlAuFL3pioleRlO9k+QOFk/fqbTP/w7ztfJRozRXIl5/etoyvQPTLLEYkq4FIz31IEQtQhKbejDnkmXqrH9hCeh+khZEcgh60fW0gGjkeJw5UutBlFkJlMJPSnePlzzfdLxnM025W55TdunRVfsHyYBs//bHNC7A7ZBOyEc0ga9vLXDtfAYxGDSvM9KA+OTF6k/BuqFj2p1eZ+8VYVm9FEeFXYXnJ36CmBlzrnD/amcMsBwJNuKmUXaQYHxQAZLatT9xtLmf8kG3rHgoBWjLFlRx/l/V7Y+N0zI5vprWFHMN7 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:SG2PR0601MB1454; BCL:0; PCL:0; RULEID:; SRVR:SG2PR0601MB1454; X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1454; 4:0CRDCXL8ZyuG95XU7hS1GaDhOy6Mtu+uPLEB4lX9wqeqQkHm2zPInAMRSjuztpgJWghnXmA2U4BVk4zFRCha47EAjez3UG9tyHzQUU4fumS5ENLHe/GrK31mknvclsfpNRlLYR7e4/y2S6+7/qmkK8q6OTmyrlJT0iVAIM60dG8rhrgi3oKymVodK6eBhiZ7LjvL3qMSB1gzNqiQdP4BfJLh9Idwl5VriuZ8jLIXZ+c6CxKLi4uPfgAmJ8wocpSzxAwLsnjh5/qCJ3aciU7So0jEF0DWirGLFeqEjlsigUiLaUR3UZ+BEYNQg+LoZ+MxceED+G/7Z535r/2yi40vNierQhnG3iiNReVQUrrzm1d9WEnVV/D1OmzHpz7j34EVDSVlJEv86h+IZGdMkuAZrw== X-Forefront-PRVS: 00286C0CA6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(189002)(199003)(50466002)(7736002)(7846002)(305945005)(106356001)(92566002)(19580405001)(69596002)(86362001)(2950100001)(81156014)(81166006)(66066001)(47776003)(19580395003)(229853001)(77096005)(586003)(68736007)(83506001)(23726003)(33646002)(46406003)(54356999)(50986999)(76176999)(105586002)(53416004)(6116002)(3846002)(42186005)(4326007)(8676002)(97736004)(36756003)(110136002)(101416001)(4001350100001)(189998001)(2906002)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:SG2PR0601MB1454; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SG2PR0601MB1454; 23:kPYaF0BT441HbwXhtznCjkLykNbg56i8pUy7O3W?= =?us-ascii?Q?AkZ4tIvEecEsAX81uMYM4WMl8yz8B8GR7SOOqf657fmREQpgOEBTtWkAIwDs?= =?us-ascii?Q?2GSpK6ZX/euifCy1tfiJx1UybW88Ks5iUQlCH8N4wmrkgzq09wQlLFtAMPto?= =?us-ascii?Q?Iuj3eQWHIFGIVi1NJkAyKCP4yeuETLBiXQzlB2+mtiYu3OEuRKLcGlB5VU8O?= =?us-ascii?Q?hk4rQXFZmUJf3JXgozmMjwj2uihh10dOe175/7u2ePYTGbjjajZ/x4s5cUDT?= =?us-ascii?Q?XuA5JAZWQQgWeqZkgJafH7UsznRPUiDqNjO4LAZcoeN27rfDLkKfRe2tzjvW?= =?us-ascii?Q?vznSPakvIWlKnEv86VNIBg93ofSazn6/7wlyPQ+YJvMZZ03U1Vvz+EMfwcWt?= =?us-ascii?Q?GqED+b4nQUh9rcnxfJPVY3Jrt0NGJRxbJldtqDCgfUk7k4fOU55o1xIDpEsI?= =?us-ascii?Q?HZSNgKalt2cpjhin9Dh86DiYWpBdpNn62uOOqvR40Q79KO+asifqnovN79YE?= =?us-ascii?Q?E7J/4YwvYw5BFyS052eq3hIA/GoRDw/1YqX0mVymDzk9TGI6gN5Lh970/qPj?= =?us-ascii?Q?zeA+iKtcziJj49GD+vSdqy6mgqTOV0IShXzz2gNVYnmlzu+FtWXO67cAuCPj?= =?us-ascii?Q?053YQO8+kylvWa7L4kBZpOndllwUqSKfQDlewMu1ar+h2P+A7IEFukfyJ/Jr?= =?us-ascii?Q?41chDw1nh9w4IYbwHcS5fGb0tQKMeNDR9nPUMx0R7P0UKCaiS8JjDHFvxhzK?= =?us-ascii?Q?XlS7GnLtRamMYNMjOwkPUGE6kWUONMBEUQWLI9Geb9iQ+H+L1fUZC/uPkIJ4?= =?us-ascii?Q?21dQGckpSywZgRDtDhnbu6wO5eTD7NGFJnmXeTDpgbKWIT2vTiFipElL/328?= =?us-ascii?Q?oYoZw/jO5ynL5tHjbQV2Id1mTlT3xXeZ6nJsyWQpeLj3JuZYxWZyNFgHYp67?= =?us-ascii?Q?KBIK555nCZmY+/qqjPanVrg0nVVvNg0hJ/TFUfh3nMgXzDlvgWNLDVSWNTXK?= =?us-ascii?Q?qd/p9CTHc0EJJ2QEsI+/VonfQEEUx3qi7IqakLH0G2qqXUFeF0BWLD9QAFa/?= =?us-ascii?Q?8Z4NVQNNiOTC2xnBwUbmqROH5LTn22hwqTOUws0hBjc0q/bfjfwMCoXxAzqe?= =?us-ascii?Q?bJP7SMw9WtypvTSkXPpfaqoMTpnZdmeBw6uSw53jnGEkPCu5m33C10Q=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1454; 6:QanfAuEr60WQv1iU0o+yakkCps4SQUgDaUOa2So3UhLe0Z4zzR8X2rtYY3+npI1LBrLiRqjORR3fdTpvKxT41NCrrtDjp/1uDnwftkojWRn6TcaXhHmcip0kebQUER9dhzLZMNX52BU2aEsdVDRJiVyzv+WZuc3NKXN610xE3jeNf4rVF/ZRG7vD7hhCSraEqspAQYUQEdUwAJTEa18E73zcf+eNkKF5yWGFqJuXXGisiDn+XaICj9pFq0di9bnLrnMZEGpPH7i13G8AAK7lXuNV0c8M54nEvhAKfvgJIRqrosxuJUY0kRyyPYzZg7yYmNTDXIl/BaAy/AE9Pz4PUA==; 5:oys8m4WiMmECAOjYKK7vLlVdyaVf1HzTrNK3umFpGoPVe7d58i4MpmpnIz38yaRn5BN4iQuAhJ1d9cSWSzifT3utb7QhOjacgAj7hBoZdNeR/KEb3zxMquOm9k/IF/cx5TfSC6wdfXIwEAOg6P0w5A==; 24:DDSlahmpQICpci+3BAx5on11c62hDvokZBhfoLRzxLVmpVlxeSgX8RSCFYTWmi6vE2d7EDRuHX9Gyh4oRTrg+vvmVZvHxI2NLo/aqxLWvv4=; 7:l4eKIgZzuTSw5XIOCtt5IXO4pGYIkFr7zkAxpNdGwZTHVBajfFNxaW20Yo/p9gqQLvigFtKr2tPYolH18lDuiqTZHuQba8eQmzPlZC9ZnYtJIRJMULAnruibkji6Etsj15+xjuJKq8TVcYDhJ+b0JcbOci+mhMa1M2D0+dZgxMLxIfdDTH85mrRob+FQuemMxRCti7uMI1jMzOqW5hX/HCaIYQkW9PCQxoCGVVEvqhWSCCwLt4qt7GBjzy+Wrh5S SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1454; 20:UEcDgh3SZPakAXphY/k8CjMPr32WExzdxrNZyIfjpTT48ev0mHE8i5OnIaWBClQJEnwtud5cBxiIemz+DZ3PlTGtK5ojk2CGIs0DQQhFn7ifJ31F4+QvMBFEFzuMQbDMKsE0PkMs2ZZfRU4H2B5c0FMyTRY9gn/43A4rPznE4y8= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2016 09:32:18.4754 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: SG2PR0601MB1454 Cc: linux-renesas-soc@vger.kernel.org, Linux-ALSA , Simon , Liam Girdwood Subject: [alsa-devel] [PATCH 145/159] ASoC: codec duplicated callback function goes to component on wm8961 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/wm8961.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/wm8961.c b/sound/soc/codecs/wm8961.c index e30446a..4b51761 100644 --- a/sound/soc/codecs/wm8961.c +++ b/sound/soc/codecs/wm8961.c @@ -888,12 +888,14 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8961 = { .set_bias_level = wm8961_set_bias_level, .suspend_bias_off = true, - .controls = wm8961_snd_controls, - .num_controls = ARRAY_SIZE(wm8961_snd_controls), - .dapm_widgets = wm8961_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(wm8961_dapm_widgets), - .dapm_routes = audio_paths, - .num_dapm_routes = ARRAY_SIZE(audio_paths), + .component_driver = { + .controls = wm8961_snd_controls, + .num_controls = ARRAY_SIZE(wm8961_snd_controls), + .dapm_widgets = wm8961_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(wm8961_dapm_widgets), + .dapm_routes = audio_paths, + .num_dapm_routes = ARRAY_SIZE(audio_paths), + }, }; static const struct regmap_config wm8961_regmap = {