From patchwork Thu Sep 22 09:37:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 9345007 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 11F8D607D0 for ; Thu, 22 Sep 2016 10:53:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0397B2A987 for ; Thu, 22 Sep 2016 10:53:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EB5CD2A98A; Thu, 22 Sep 2016 10:53:10 +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.9 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE autolearn=ham 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 847482A987 for ; Thu, 22 Sep 2016 10:53:09 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 215722670FB; Thu, 22 Sep 2016 12:53:08 +0200 (CEST) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 4EDF1267064; Thu, 22 Sep 2016 12:50:41 +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 8BB2226709E; Thu, 22 Sep 2016 11:38:12 +0200 (CEST) Received: from mout.kundenserver.de (mout.kundenserver.de [217.72.192.73]) by alsa0.perex.cz (Postfix) with ESMTP id 442BC2665A3 for ; Thu, 22 Sep 2016 11:38:06 +0200 (CEST) Received: from wuerfel.lan. ([78.43.20.153]) by mrelayeu.kundenserver.de (mreue103) with ESMTPA (Nemesis) id 0LcFAj-1b5ewf0nBt-00jYug; Thu, 22 Sep 2016 11:38:00 +0200 From: Arnd Bergmann To: Mark Brown Date: Thu, 22 Sep 2016 11:37:32 +0200 Message-Id: <20160922093756.2093879-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:z0+2n6qzaTKracQ5eVVldE8ebwb1OHADCiGeeXtteBZuDqc5KKE zLcH5AmD8VdKTbcL9ab3KNySU31w+8HkGDHj8Ddd2ZrgbtJzRDSOiu2byGYz6PMblBrdGo7 vUnkEXSDC/F/x/IqfqUnWaLS1PlUgnhWW1krzAbSVylO9+CecRJap7DsY5PEtUiQHHPqiwg zmo6LjVgQXIvfhVa0Hyag== X-UI-Out-Filterresults: notjunk:1; V01:K0:r8iKOASIXjQ=:PMvoIUBwkLsF8vSXRZgGoe hxyik6545hn8reHub2JGot8fMKBDVZ/7gwcBmyiXa6X5JCMNmhju9mB6KJt62ML0imTMx+g4H nM4FW2b7bNIUqHAXceouACOyDG7Qg+XvhgVfe7Hck0l5cvQnZAnXAyLwGvqVDFGcYR+CdjfzT jwluwlREFTB9WxJ8eZGOjeYOwoOgW7Aqlf5r8MMlQB8O7DjkRFaTm2L6ezCqfakqOnPQ3mKSi AWfE6PeWLlvYiuJhhfH4s6WetkHkdmxU1rN+fb4ER2dA8lVsJO1Aezgpnm0Ozv00rqX3Gem0/ rGL65l3S3Yc143S77EreBmsV7eQGL4JDDt32NFd2FRdne4u2azTgBDINvHLcgONZhSeqvRfmG /6IEWKNpnfSpMuk//RXeXjxn0wOCe9tr29LVbxTeF+ucb4MYjxZfOdiKFHEN3h2c1l3WNbv4o ttHuzQ4R3xe0+DxeXfmE7cDKfav0wueJ3oH9kqgkoKzpJskeiV3+XPBSBfewfd3AFum+Plswa 84qE5mrpZfpR1RqFlaMaFJ+esZHIbbH1crTKRkWskeDyxpXZpWfA+5ZwJcwI80jBRMn/hD+Gj h759b20c2ZQCsB361SvBEXV0GJb8qbsIWDYf63Ldt4L48oqUMWmWOTyuJveWplyZUW0y43amg CjKLxukrP+7kPNMkpnc4KVuv7BjXlaEQEwvVIBmKjriH3iIqM2WEh0RK+tqMUzLRNiHE= Cc: alsa-devel@alsa-project.org, Kuninori Morimoto , Arnd Bergmann , Liam Girdwood , linux-kernel@vger.kernel.org Subject: [alsa-devel] [PATCH] ASoC: cq93vc: duplicated callback function goes to component 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: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP A cleanup removed a couple of members from struct snd_soc_codec_driver after changing codec drivers to no longer use them, but one codec was missed in the process, giving a build error: sound/soc/codecs/cq93vc.c:134:2: error: unknown field 'controls' specified in initializer .controls = cq93vc_snd_controls, This moves the members from the cq93vc codec driver to its component driver just like the other codecs already had. Fixes: 8073aefa6082 ("ASoC: remove codec duplicated callback function") Signed-off-by: Arnd Bergmann Acked-by: Kuninori Morimoto --- sound/soc/codecs/cq93vc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/cq93vc.c b/sound/soc/codecs/cq93vc.c index 1c895a53001d..7a2d9a2ee427 100644 --- a/sound/soc/codecs/cq93vc.c +++ b/sound/soc/codecs/cq93vc.c @@ -131,8 +131,10 @@ static struct regmap *cq93vc_get_regmap(struct device *dev) static struct snd_soc_codec_driver soc_codec_dev_cq93vc = { .set_bias_level = cq93vc_set_bias_level, .get_regmap = cq93vc_get_regmap, - .controls = cq93vc_snd_controls, - .num_controls = ARRAY_SIZE(cq93vc_snd_controls), + .component_driver = { + .controls = cq93vc_snd_controls, + .num_controls = ARRAY_SIZE(cq93vc_snd_controls), + }, }; static int cq93vc_platform_probe(struct platform_device *pdev)