* [PATCH] ASoC: codecs: fix wm8524 build error
@ 2017-07-31 16:05 Arnd Bergmann
2017-08-01 7:17 ` Mihai Serban
2017-08-01 14:16 ` Applied "ASoC: codecs: fix wm8524 build error" to the asoc tree Mark Brown
0 siblings, 2 replies; 3+ messages in thread
From: Arnd Bergmann @ 2017-07-31 16:05 UTC (permalink / raw)
To: Liam Girdwood, Mark Brown, Mihai Serban
Cc: Arnd Bergmann, Jaroslav Kysela, Takashi Iwai, Shengjiu Wang,
patches, alsa-devel, linux-kernel
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 <arnd@arndb.de>
---
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)
{
--
2.9.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] ASoC: codecs: fix wm8524 build error
2017-07-31 16:05 [PATCH] ASoC: codecs: fix wm8524 build error Arnd Bergmann
@ 2017-08-01 7:17 ` Mihai Serban
2017-08-01 14:16 ` Applied "ASoC: codecs: fix wm8524 build error" to the asoc tree Mark Brown
1 sibling, 0 replies; 3+ messages in thread
From: Mihai Serban @ 2017-08-01 7:17 UTC (permalink / raw)
To: lgirdwood, broonie, arnd
Cc: patches, linux-kernel, S.j. Wang, tiwai, perex, alsa-devel
On Lu, 2017-07-31 at 18:05 +0200, Arnd Bergmann wrote:
> 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 <arnd@arndb.de>
Acked-by: Mihai Serban <mihai.serban@nxp.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Applied "ASoC: codecs: fix wm8524 build error" to the asoc tree
2017-07-31 16:05 [PATCH] ASoC: codecs: fix wm8524 build error Arnd Bergmann
2017-08-01 7:17 ` Mihai Serban
@ 2017-08-01 14:16 ` Mark Brown
1 sibling, 0 replies; 3+ messages in thread
From: Mark Brown @ 2017-08-01 14:16 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Mihai Serban, Mark Brown, Liam Girdwood, Mark Brown,
Mihai Serban, alsa-devel, patches, Shengjiu Wang, Takashi Iwai,
linux-kernel, alsa-devel
The patch
ASoC: codecs: fix wm8524 build error
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark
>From bf11ecb7eebd28d70bf5aa3170c6fe7156c33c5b Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 31 Jul 2017 18:05:46 +0200
Subject: [PATCH] ASoC: codecs: fix wm8524 build error
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 <arnd@arndb.de>
Acked-by: Mihai Serban <mihai.serban@nxp.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
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)
{
--
2.13.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-08-01 14:17 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-07-31 16:05 [PATCH] ASoC: codecs: fix wm8524 build error Arnd Bergmann
2017-08-01 7:17 ` Mihai Serban
2017-08-01 14:16 ` Applied "ASoC: codecs: fix wm8524 build error" to the asoc tree Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).