]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
ASoC: gtm601: fix build warning
authorArnd Bergmann <arnd@arndb.de>
Tue, 7 Jan 2020 21:48:35 +0000 (22:48 +0100)
committerMark Brown <broonie@kernel.org>
Tue, 7 Jan 2020 22:29:38 +0000 (22:29 +0000)
The driver produces warnings without CONFIG_OF, and makes
no sense without it either:

sound/soc/codecs/gtm601.c:50:34: error: 'bm818_dai' defined but not used [-Werror=unused-variable]
 static struct snd_soc_dai_driver bm818_dai = {
                                  ^~~~~~~~~
sound/soc/codecs/gtm601.c:32:34: error: 'gtm601_dai' defined but not used [-Werror=unused-variable]
 static struct snd_soc_dai_driver gtm601_dai = {
                                  ^~~~~~~~~~

Remove the #ifdef check to avoid the warning.

Fixes: 057a317a8d94 ("ASoC: gtm601: add Broadmobi bm818 sound profile")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Link: https://lore.kernel.org/r/20200107214846.1284981-1-arnd@arndb.de
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/gtm601.c

index 7f05ebcb88d16c5128c116bc529db4a4195ef2ab..ae9e1c70ca57b6fe577a8d94559ab6e664a12c85 100644 (file)
@@ -87,14 +87,12 @@ static int gtm601_platform_probe(struct platform_device *pdev)
                        (struct snd_soc_dai_driver *)dai_driver, 1);
 }
 
-#if defined(CONFIG_OF)
 static const struct of_device_id gtm601_codec_of_match[] = {
        { .compatible = "option,gtm601", .data = (void *)&gtm601_dai },
        { .compatible = "broadmobi,bm818", .data = (void *)&bm818_dai },
        {},
 };
 MODULE_DEVICE_TABLE(of, gtm601_codec_of_match);
-#endif
 
 static struct platform_driver gtm601_codec_driver = {
        .driver = {