This field is not really used. It is always set to a known value. Drop it
to simplify the code.
Signed-off-by: Simon Glass <s...@chromium.org>
---
drivers/sound/max98095.c | 14 --------------
drivers/sound/wm8994.c | 10 ----------
include/sound.h | 9 ---------
3 files changed, 33 deletions(-)
diff --git a/drivers/sound/max98095.c b/drivers/sound/max98095.c
index d05c261a399..efaaeb8f3b8 100644
--- a/drivers/sound/max98095.c
+++ b/drivers/sound/max98095.c
@@ -24,12 +24,7 @@
#include "i2s.h"
#include "max98095.h"
-enum max98095_type {
- MAX98095,
-};
-
struct max98095_priv {
- enum max98095_type devtype;
unsigned int sysclk;
unsigned int rate;
unsigned int fmt;
@@ -484,14 +479,6 @@ static int max98095_do_init(struct sound_codec_info
*pcodec_info,
/* shift the device address by 1 for 7 bit addressing */
g_max98095_i2c_dev_addr = pcodec_info->i2c_dev_addr >> 1;
- if (pcodec_info->codec_type == CODEC_MAX_98095) {
- g_max98095_info.devtype = MAX98095;
- } else {
- debug("%s: Codec id [%d] not defined\n", __func__,
- pcodec_info->codec_type);
- return -1;
- }
-
ret = max98095_device_init(&g_max98095_info, aif_id);
if (ret < 0) {
debug("%s: max98095 codec chip init failed\n", __func__);
@@ -555,7 +542,6 @@ static int get_max98095_codec_values(struct
sound_codec_info *pcodec_info,
debug("%s: Unknown compat id %d\n", __func__, compat);
return -1;
}
- pcodec_info->codec_type = CODEC_MAX_98095;
if (error == -1) {
debug("fail to get max98095 codec node properties\n");
return -1;
diff --git a/drivers/sound/wm8994.c b/drivers/sound/wm8994.c
index 34bc4eb516f..2e84e92a2e0 100644
--- a/drivers/sound/wm8994.c
+++ b/drivers/sound/wm8994.c
@@ -847,8 +847,6 @@ static int get_codec_values(struct sound_codec_info
*pcodec_info,
return -1;
}
- pcodec_info->codec_type = CODEC_WM_8994;
-
if (error == -1) {
debug("fail to get wm8994 codec node properties\n");
return -1;
@@ -875,14 +873,6 @@ int wm8994_init(const void *blob, enum en_audio_interface
aif_id,
g_wm8994_i2c_dev_addr = pcodec_info->i2c_dev_addr;
wm8994_i2c_init(pcodec_info->i2c_bus);
- if (pcodec_info->codec_type == CODEC_WM_8994) {
- g_wm8994_info.type = WM8994;
- } else {
- debug("%s: Codec id [%d] not defined\n", __func__,
- pcodec_info->codec_type);
- return -1;
- }
-
ret = wm8994_device_init(&g_wm8994_info, aif_id);
if (ret < 0) {
debug("%s: wm8994 codec chip init failed\n", __func__);
diff --git a/include/sound.h b/include/sound.h
index 149e12dbc60..c4ac3193fe7 100644
--- a/include/sound.h
+++ b/include/sound.h
@@ -7,14 +7,6 @@
#ifndef __SOUND_H__
#define __SOUND_H__
-/* sound codec enum */
-enum sound_codec {
- CODEC_WM_8994,
- CODEC_WM_8995,
- CODEC_MAX_98095,
- CODEC_MAX
-};
-
/* sound codec enum */
enum sound_compat {
AUDIO_COMPAT_SPI,
@@ -25,7 +17,6 @@ enum sound_compat {
struct sound_codec_info {
int i2c_bus;
int i2c_dev_addr;
- enum sound_codec codec_type;
};
/*
--
2.20.0.rc1.387.gf8505762e3-goog
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
