openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ASoC: ingenic: Unconditionally depend on devicetree 

All boards with Ingenic SoCs probe with devicetree already, we have no
use for a non-devicetree path.

This solves some compilation warnings that were caused by unused
variables in the case where CONFIG_OF was disabled.

Reported-by: kbuild test robot <lkp@intel.com>
Signed-off-by: Paul Cercueil <paul@crapouillou.net>
Link: https://lore.kernel.org/r/20200523125455.12392-1-paul@crapouillou.net
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Paul Cercueil 2020-05-23 14:54:55 +02:00 committed by Mark Brown
parent 93e0f69a40
commit e6825bae26
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
6 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sound/soc/codecs/Kconfig
View File

@ -682,6 +682,7 @@ config SND_SOC_CX2072X
config SND_SOC_JZ4740_CODEC config SND_SOC_JZ4740_CODEC
depends on MIPS || COMPILE_TEST depends on MIPS || COMPILE_TEST
depends on OF
select REGMAP_MMIO select REGMAP_MMIO
tristate "Ingenic JZ4740 internal CODEC" tristate "Ingenic JZ4740 internal CODEC"
help help
@ -693,6 +694,7 @@ config SND_SOC_JZ4740_CODEC
config SND_SOC_JZ4725B_CODEC config SND_SOC_JZ4725B_CODEC
depends on MIPS || COMPILE_TEST depends on MIPS || COMPILE_TEST
depends on OF
select REGMAP select REGMAP
tristate "Ingenic JZ4725B internal CODEC" tristate "Ingenic JZ4725B internal CODEC"
help help
@ -704,6 +706,7 @@ config SND_SOC_JZ4725B_CODEC
config SND_SOC_JZ4770_CODEC config SND_SOC_JZ4770_CODEC
depends on MIPS || COMPILE_TEST depends on MIPS || COMPILE_TEST
depends on OF
select REGMAP select REGMAP
tristate "Ingenic JZ4770 internal CODEC" tristate "Ingenic JZ4770 internal CODEC"
help help

4
sound/soc/codecs/jz4725b.c
View File

@ -574,19 +574,17 @@ static int jz4725b_codec_probe(struct platform_device *pdev)
return ret; return ret;
} }
#ifdef CONFIG_OF
static const struct of_device_id jz4725b_codec_of_matches[] = { static const struct of_device_id jz4725b_codec_of_matches[] = {
{ .compatible = "ingenic,jz4725b-codec", }, { .compatible = "ingenic,jz4725b-codec", },
{ } { }
}; };
MODULE_DEVICE_TABLE(of, jz4725b_codec_of_matches); MODULE_DEVICE_TABLE(of, jz4725b_codec_of_matches);
#endif
static struct platform_driver jz4725b_codec_driver = { static struct platform_driver jz4725b_codec_driver = {
.probe = jz4725b_codec_probe, .probe = jz4725b_codec_probe,
.driver = { .driver = {
.name = "jz4725b-codec", .name = "jz4725b-codec",
.of_match_table = of_match_ptr(jz4725b_codec_of_matches), .of_match_table = jz4725b_codec_of_matches,
}, },
}; };
module_platform_driver(jz4725b_codec_driver); module_platform_driver(jz4725b_codec_driver);

4
sound/soc/codecs/jz4740.c
View File

@ -344,19 +344,17 @@ static int jz4740_codec_probe(struct platform_device *pdev)
return ret; return ret;
} }
#ifdef CONFIG_OF
static const struct of_device_id jz4740_codec_of_matches[] = { static const struct of_device_id jz4740_codec_of_matches[] = {
{ .compatible = "ingenic,jz4740-codec", }, { .compatible = "ingenic,jz4740-codec", },
{ } { }
}; };
MODULE_DEVICE_TABLE(of, jz4740_codec_of_matches); MODULE_DEVICE_TABLE(of, jz4740_codec_of_matches);
#endif
static struct platform_driver jz4740_codec_driver = { static struct platform_driver jz4740_codec_driver = {
.probe = jz4740_codec_probe, .probe = jz4740_codec_probe,
.driver = { .driver = {
.name = "jz4740-codec", .name = "jz4740-codec",
.of_match_table = of_match_ptr(jz4740_codec_of_matches), .of_match_table = jz4740_codec_of_matches,
}, },
}; };

2
sound/soc/codecs/jz4770.c
View File

@ -937,7 +937,7 @@ static struct platform_driver jz4770_codec_driver = {
.probe = jz4770_codec_probe, .probe = jz4770_codec_probe,
.driver = { .driver = {
.name = "jz4770-codec", .name = "jz4770-codec",
.of_match_table = of_match_ptr(jz4770_codec_of_matches), .of_match_table = jz4770_codec_of_matches,
}, },
}; };
module_platform_driver(jz4770_codec_driver); module_platform_driver(jz4770_codec_driver);

2
sound/soc/jz4740/Kconfig
View File

@ -2,7 +2,7 @@
config SND_JZ4740_SOC_I2S config SND_JZ4740_SOC_I2S
tristate "SoC Audio (I2S protocol) for Ingenic JZ4740 SoC" tristate "SoC Audio (I2S protocol) for Ingenic JZ4740 SoC"
depends on MIPS || COMPILE_TEST depends on MIPS || COMPILE_TEST
depends on HAS_IOMEM depends on OF && HAS_IOMEM
select SND_SOC_GENERIC_DMAENGINE_PCM select SND_SOC_GENERIC_DMAENGINE_PCM
help help
Say Y if you want to use I2S protocol and I2S codec on Ingenic JZ4740 Say Y if you want to use I2S protocol and I2S codec on Ingenic JZ4740

4
sound/soc/jz4740/jz4740-i2s.c
View File

@ -504,7 +504,6 @@ static const struct snd_soc_component_driver jz4740_i2s_component = {
.resume = jz4740_i2s_resume, .resume = jz4740_i2s_resume,
}; };
#ifdef CONFIG_OF
static const struct of_device_id jz4740_of_matches[] = { static const struct of_device_id jz4740_of_matches[] = {
{ .compatible = "ingenic,jz4740-i2s", .data = &jz4740_i2s_soc_info }, { .compatible = "ingenic,jz4740-i2s", .data = &jz4740_i2s_soc_info },
{ .compatible = "ingenic,jz4760-i2s", .data = &jz4760_i2s_soc_info }, { .compatible = "ingenic,jz4760-i2s", .data = &jz4760_i2s_soc_info },
@ -513,7 +512,6 @@ static const struct of_device_id jz4740_of_matches[] = {
{ /* sentinel */ } { /* sentinel */ }
}; };
MODULE_DEVICE_TABLE(of, jz4740_of_matches); MODULE_DEVICE_TABLE(of, jz4740_of_matches);
#endif
static int jz4740_i2s_dev_probe(struct platform_device *pdev) static int jz4740_i2s_dev_probe(struct platform_device *pdev)
{ {
@ -558,7 +556,7 @@ static struct platform_driver jz4740_i2s_driver = {
.probe = jz4740_i2s_dev_probe, .probe = jz4740_i2s_dev_probe,
.driver = { .driver = {
.name = "jz4740-i2s", .name = "jz4740-i2s",
.of_match_table = of_match_ptr(jz4740_of_matches) .of_match_table = jz4740_of_matches,
}, },
}; };