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 7c37bd070156fab6b2fdc08988db436982e5bb94..d05c261a39959c47ddf5f0dc5ecc4a8b489b6912 100644 (file)
--- 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 e671f6b85ec0ceef0a6c8983bfe49297d2d05ec1..34bc4eb516f297ac38d9c171d63f5ee2d45c0c12 100644 (file)
--- 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;