commit 6e5faf028d50a2ab3aa1fe5754f8ebfa40aa66ac
author Simon Glass <sjg@chromium.org> Mon Dec 03 04:37:21 2018 -0700
committer Simon Glass <sjg@chromium.org> Thu Dec 13 16:32:49 2018 -0700
tree 8f2d876351890bde4e4ed822473709d3f0de1440
parent 5cf327b5831928a79a7df415f78e9765ea560ad4

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>

drivers/sound/max98095.c

diff --git a/drivers/sound/max98095.c b/drivers/sound/max98095.c
index 7c37bd0..d05c261 100644
--- a/drivers/sound/max98095.c
+++ b/drivers/sound/max98095.c
@@ -522,7 +522,6 @@
 				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 @@
 		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");

drivers/sound/wm8994.c

diff --git a/drivers/sound/wm8994.c b/drivers/sound/wm8994.c
index e671f6b..34bc4eb 100644
--- a/drivers/sound/wm8994.c
+++ b/drivers/sound/wm8994.c
@@ -813,7 +813,6 @@
 			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 @@
 		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;