From patchwork Mon Jul 31 16:05:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 9872407 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 338E6603B4 for ; Mon, 31 Jul 2017 16:08:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 26A8E27F97 for ; Mon, 31 Jul 2017 16:08:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1B5672837D; Mon, 31 Jul 2017 16:08:27 +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 6447D283C9 for ; Mon, 31 Jul 2017 16:08:23 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id B3FB4266FD8; Mon, 31 Jul 2017 18:07:29 +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 6C95B266FD8; Mon, 31 Jul 2017 18:07:28 +0200 (CEST) Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.126.130]) by alsa0.perex.cz (Postfix) with ESMTP id 91CD5266FD2 for ; Mon, 31 Jul 2017 18:07:26 +0200 (CEST) Received: from wuerfel.lan ([78.43.238.10]) by mrelayeu.kundenserver.de (mreue001 [212.227.15.129]) with ESMTPA (Nemesis) id 0LjiED-1e950E3nab-00btKS; Mon, 31 Jul 2017 18:07:16 +0200 From: Arnd Bergmann To: Liam Girdwood , Mark Brown , Mihai Serban Date: Mon, 31 Jul 2017 18:05:46 +0200 Message-Id: <20170731160713.3732735-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:lp8xAnqmuPt1VDxzMc47txMmRQR/cbf1dhN6wLaBt8XfHYDD1RI xkKiiWQNVLl7IDQ2lT48Rk+luP9/+ePp63lqVFFRDtjLYd8rpJ83fl06Dcv+jtRl99ive8M r89s4GTyrZszdxja7AaRaNWmnF/FtIlbJLXE6epEB8IKCzfBATdYoUme5Ff29hwx8jNHIbE O8D31YbVfCQen26LrSvPg== X-UI-Out-Filterresults: notjunk:1; V01:K0:Fv9DnO4qU5s=:Zss5DaWRc599juGMz64eH2 20dmpxAfQq+DyQFRK71NuTYexk2ocuf6bnXtpo5bpU7PuAZyyygOOOSWNLRrNRDk02RunCm0f B7xtbp/Lvt8Ga02re1suGI022VFrlphfmQMv0U9ZAiFBMi2/CB3579GfoXj+BuYl6udk4nMm7 95DmK1GDESGjHWmza6gzrMT5tYhOK3884rBFFOK2zArzsACoWnIO6ZhhAQbWNWNV/kr8OfsXn +FWvXlZ140ND4NuIhedZ3ofG/6lzY7h1XMTSUHpBEokUM2mh7j3aWkIbdAo7f6Og6tKP3BaMU PRwv5IJk/P1mno24ZLeFixDwj/MjffQzEYS4eynwefRjdFccgGQhfR6rhk3sZHIZOZfGvi3// 4+jrq9S6lYeHVWafklrU/tYLZuM7zjL3+02xRS0yknl1Ou23a+Q4RdqHSJhgWwBfHDc+jY3Cs mUFodDCIU2OS38iDOzpYYIZI+JaCqRN3/1SeuWmzLbUE21U7kboeUbI8/opq3T9rxoufdDzLr +9FtyfL0ICd255FYZfyifioyjDoItSdPYTLR0S32cUbMBrJ5TMl5Ew9HxlUcVwyVSiVE2tYv/ eyn1z8bPOsz1Sjtyd1oKrVkqAuWjtWq13PiyXqgtAZg9vX8X5Z/mQqYNCwAHIoLj/kqwC3N/+ wMdQMKkSmJSAAWox8rqG7Tv7ZvkGbV/6PYGQzpAeUmRzL15joEopKEzk1itsHQfzsrX3Ch4bZ arS+jSX7H+UdwEDtGnuoq8KonXvnX2Nu2x6CiA== Cc: alsa-devel@alsa-project.org, Arnd Bergmann , patches@opensource.cirrus.com, Shengjiu Wang , Takashi Iwai , linux-kernel@vger.kernel.org Subject: [alsa-devel] [PATCH] ASoC: codecs: fix wm8524 build error 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 When CONFIG_OF is disabled, we run into a build error: sound/soc/codecs/wm8524.c:257:21: error: 'wm8524_of_match' undeclared here (not in a function); did you mean 'wm8524_dai'? This removes the unnecessary #ifdef around the match table. Fixes: 007b6a54c305 ("ASoC: codecs: add wm8524 codec driver") Signed-off-by: Arnd Bergmann Acked-by: Mihai Serban --- sound/soc/codecs/wm8524.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sound/soc/codecs/wm8524.c b/sound/soc/codecs/wm8524.c index f42ec664877c..e22b76d64e32 100644 --- a/sound/soc/codecs/wm8524.c +++ b/sound/soc/codecs/wm8524.c @@ -206,13 +206,11 @@ static const struct snd_soc_codec_driver soc_codec_dev_wm8524 = { }, }; -#ifdef CONFIG_OF static const struct of_device_id wm8524_of_match[] = { { .compatible = "wlf,wm8524" }, { /* sentinel*/ } }; MODULE_DEVICE_TABLE(of, wm8524_of_match); -#endif static int wm8524_codec_probe(struct platform_device *pdev) {