The patch ASoC: soc-core: Fix -Wunused-const-variable warning has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-5.4 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 0faf1237c60a3791d7ff32035d3097d3e022e68f Mon Sep 17 00:00:00 2001 From: YueHaibing <yuehaibing@xxxxxxxxxx> Date: Tue, 13 Aug 2019 22:25:01 +0800 Subject: [PATCH] ASoC: soc-core: Fix -Wunused-const-variable warning If CONFIG_DMI is not set, gcc warns: sound/soc/soc-core.c:81:27: warning: dmi_blacklist defined but not used [-Wunused-const-variable=] Add #ifdef guard around it. Reported-by: Hulk Robot <hulkci@xxxxxxxxxx> Signed-off-by: YueHaibing <yuehaibing@xxxxxxxxxx> Link: https://lore.kernel.org/r/20190813142501.13080-1-yuehaibing@xxxxxxxxxx Signed-off-by: Mark Brown <broonie@xxxxxxxxxx> --- sound/soc/soc-core.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index e9f44505cc3e..abe2f47cee6e 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -73,6 +73,7 @@ static int pmdown_time = 5000; module_param(pmdown_time, int, 0); MODULE_PARM_DESC(pmdown_time, "DAPM stream powerdown time (msecs)"); +#ifdef CONFIG_DMI /* * If a DMI filed contain strings in this blacklist (e.g. * "Type2 - Board Manufacturer" or "Type1 - TBD by OEM"), it will be taken @@ -87,6 +88,7 @@ static const char * const dmi_blacklist[] = { "Board Product Name", NULL, /* terminator */ }; +#endif static ssize_t pmdown_time_show(struct device *dev, struct device_attribute *attr, char *buf) -- 2.20.1 _______________________________________________ Alsa-devel mailing list Alsa-devel@xxxxxxxxxxxxxxxx https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
