aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2016-11-16 20:13:00 -0500
committerMark Brown <broonie@kernel.org>2016-11-18 07:07:19 -0500
commite2d575918bf38d16cacaac789ba05d5e5a649b6f (patch)
treed42de41c0094c41ab22fd2201410ab0381c8596c
parent1001354ca34179f3db924eb66672442a173147dc (diff)
ASoC: wm9081: Remove #if IS_ENABLED(CONFIG_I2C)
wm9081 driver doesn't work without CONFIG_I2C anyway. Let's remove #if IS_ENABLED(CONFIG_I2C) And, this patch adds "depends on I2C" to Kconfig Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Acked-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com> Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--sound/soc/codecs/Kconfig1
-rw-r--r--sound/soc/codecs/wm9081.c2
2 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index c67667bb970f..5efcd9b2152f 100644
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -1048,6 +1048,7 @@ config SND_SOC_WM8998
1048 1048
1049config SND_SOC_WM9081 1049config SND_SOC_WM9081
1050 tristate 1050 tristate
1051 depends on I2C
1051 1052
1052config SND_SOC_WM9090 1053config SND_SOC_WM9090
1053 tristate 1054 tristate
diff --git a/sound/soc/codecs/wm9081.c b/sound/soc/codecs/wm9081.c
index 856867ec2813..6febef337dd2 100644
--- a/sound/soc/codecs/wm9081.c
+++ b/sound/soc/codecs/wm9081.c
@@ -1304,7 +1304,6 @@ static const struct regmap_config wm9081_regmap = {
1304 .cache_type = REGCACHE_RBTREE, 1304 .cache_type = REGCACHE_RBTREE,
1305}; 1305};
1306 1306
1307#if IS_ENABLED(CONFIG_I2C)
1308static int wm9081_i2c_probe(struct i2c_client *i2c, 1307static int wm9081_i2c_probe(struct i2c_client *i2c,
1309 const struct i2c_device_id *id) 1308 const struct i2c_device_id *id)
1310{ 1309{
@@ -1384,7 +1383,6 @@ static struct i2c_driver wm9081_i2c_driver = {
1384 .remove = wm9081_i2c_remove, 1383 .remove = wm9081_i2c_remove,
1385 .id_table = wm9081_i2c_id, 1384 .id_table = wm9081_i2c_id,
1386}; 1385};
1387#endif
1388 1386
1389module_i2c_driver(wm9081_i2c_driver); 1387module_i2c_driver(wm9081_i2c_driver);
1390 1388