Skip to content

Commit e2d5759

Browse files
morimotobroonie
authored andcommitted
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 <[email protected]> Acked-by: Charles Keepax <[email protected]> Signed-off-by: Mark Brown <[email protected]>
1 parent 1001354 commit e2d5759

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

sound/soc/codecs/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1048,6 +1048,7 @@ config SND_SOC_WM8998
10481048

10491049
config SND_SOC_WM9081
10501050
tristate
1051+
depends on I2C
10511052

10521053
config SND_SOC_WM9090
10531054
tristate

sound/soc/codecs/wm9081.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1304,7 +1304,6 @@ static const struct regmap_config wm9081_regmap = {
13041304
.cache_type = REGCACHE_RBTREE,
13051305
};
13061306

1307-
#if IS_ENABLED(CONFIG_I2C)
13081307
static int wm9081_i2c_probe(struct i2c_client *i2c,
13091308
const struct i2c_device_id *id)
13101309
{
@@ -1384,7 +1383,6 @@ static struct i2c_driver wm9081_i2c_driver = {
13841383
.remove = wm9081_i2c_remove,
13851384
.id_table = wm9081_i2c_id,
13861385
};
1387-
#endif
13881386

13891387
module_i2c_driver(wm9081_i2c_driver);
13901388

0 commit comments

Comments
 (0)