diff options
| author | Simon Glass | 2018-12-03 04:37:21 -0700 |
|---|---|---|
| committer | Simon Glass | 2018-12-13 16:32:49 -0700 |
| commit | d2eab333a7fe83eb6bfcc1b4b8a522ce1aa4d761 (patch) | |
| tree | 8f2d876351890bde4e4ed822473709d3f0de1440 | |
| parent | ee53494d0e39b110bbfa4df828c0b70131013014 (diff) | |
dm: sound: Drop unused pre-device-tree code
CONFIG_OF_CONTROL is enabled for all boards that use sound, so remove the
dead code.
Signed-off-by: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | drivers/sound/max98095.c | 6 | ||||
| -rw-r--r-- | drivers/sound/wm8994.c | 6 |
2 files changed, 0 insertions, 12 deletions
diff --git a/drivers/sound/max98095.c b/drivers/sound/max98095.c index 7c37bd07015..d05c261a399 100644 --- a/drivers/sound/max98095.c +++ b/drivers/sound/max98095.c @@ -522,7 +522,6 @@ static int get_max98095_codec_values(struct sound_codec_info *pcodec_info, const void *blob) { int error = 0; -#if CONFIG_IS_ENABLED(OF_CONTROL) enum fdt_compat_id compat; int node; int parent; @@ -556,11 +555,6 @@ static int get_max98095_codec_values(struct sound_codec_info *pcodec_info, debug("%s: Unknown compat id %d\n", __func__, compat); return -1; } -#else - pcodec_info->i2c_bus = AUDIO_I2C_BUS; - pcodec_info->i2c_dev_addr = AUDIO_I2C_REG; - debug("i2c dev addr = %d\n", pcodec_info->i2c_dev_addr); -#endif pcodec_info->codec_type = CODEC_MAX_98095; if (error == -1) { debug("fail to get max98095 codec node properties\n"); diff --git a/drivers/sound/wm8994.c b/drivers/sound/wm8994.c index e671f6b85ec..34bc4eb516f 100644 --- a/drivers/sound/wm8994.c +++ b/drivers/sound/wm8994.c @@ -813,7 +813,6 @@ static int get_codec_values(struct sound_codec_info *pcodec_info, const void *blob) { int error = 0; -#if CONFIG_IS_ENABLED(OF_CONTROL) enum fdt_compat_id compat; int node; int parent; @@ -847,11 +846,6 @@ static int get_codec_values(struct sound_codec_info *pcodec_info, debug("%s: Unknown compat id %d\n", __func__, compat); return -1; } -#else - pcodec_info->i2c_bus = AUDIO_I2C_BUS; - pcodec_info->i2c_dev_addr = AUDIO_I2C_REG; - debug("i2c dev addr = %d\n", pcodec_info->i2c_dev_addr); -#endif pcodec_info->codec_type = CODEC_WM_8994; |