From: Simon Glass <sjg@chromium.org>
Date: Mon, 3 Dec 2018 11:37:21 +0000 (-0700)
Subject: dm: sound: Drop unused pre-device-tree code
X-Git-Tag: v2019.01-rc2~7^2~35
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d2eab333a7fe83eb6bfcc1b4b8a522ce1aa4d761;p=oweals%2Fu-boot.git

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>
---

diff --git a/drivers/sound/max98095.c b/drivers/sound/max98095.c
index 7c37bd0701..d05c261a39 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 e671f6b85e..34bc4eb516 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;