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: 101762 Delivered-To: patch@linaro.org Received: by 10.140.106.72 with SMTP id d66csp2497443qgf; Thu, 22 Sep 2016 02:39:08 -0700 (PDT) X-Received: by 10.66.253.101 with SMTP id zz5mr1783297pac.32.1474537147953; Thu, 22 Sep 2016 02:39:07 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id s126si1359903pfb.16.2016.09.22.02.39.07; Thu, 22 Sep 2016 02:39:07 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756849AbcIVJiz (ORCPT + 27 others); Thu, 22 Sep 2016 05:38:55 -0400 Received: from mout.kundenserver.de ([217.72.192.73]:52040 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750778AbcIVJix (ORCPT ); Thu, 22 Sep 2016 05:38:53 -0400 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 Cc: Kuninori Morimoto , Arnd Bergmann , Liam Girdwood , Jaroslav Kysela , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Subject: [PATCH] ASoC: cq93vc: duplicated callback function goes to component 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= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- sound/soc/codecs/cq93vc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) -- 2.9.0 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)