1 files changed, 6 insertions, 25 deletions

diff --git a/sound/soc/codecs/lm49453.c b/sound/soc/codecs/lm49453.c
index 6b7fe5e54881..275b3f72f3f4 100644
--- a/sound/soc/codecs/lm49453.c
+++ b/sound/soc/codecs/lm49453.c
@@ -213,15 +213,13 @@ static const char *lm49453_adcl_mux_text[] = { "MIC1", "Aux_L" };
 
 static const char *lm49453_adcr_mux_text[] = { "MIC2", "Aux_R" };
 
-static const struct soc_enum lm49453_adcl_enum =
-        SOC_ENUM_SINGLE(LM49453_P0_ANALOG_MIXER_ADC_REG, 0,
-                        ARRAY_SIZE(lm49453_adcl_mux_text),
-                        lm49453_adcl_mux_text);
+static SOC_ENUM_SINGLE_DECL(lm49453_adcl_enum,
+                            LM49453_P0_ANALOG_MIXER_ADC_REG, 0,
+                            lm49453_adcl_mux_text);
 
-static const struct soc_enum lm49453_adcr_enum =
-        SOC_ENUM_SINGLE(LM49453_P0_ANALOG_MIXER_ADC_REG, 1,
-                        ARRAY_SIZE(lm49453_adcr_mux_text),
-                        lm49453_adcr_mux_text);
+static SOC_ENUM_SINGLE_DECL(lm49453_adcr_enum,
+                            LM49453_P0_ANALOG_MIXER_ADC_REG, 1,
+                            lm49453_adcr_mux_text);
 
 static const struct snd_kcontrol_new lm49453_adcl_mux_control =
         SOC_DAPM_ENUM("ADC Left Mux", lm49453_adcl_enum);
@@ -1409,22 +1407,6 @@ static int lm49453_resume(struct snd_soc_codec *codec)
         return 0;
 }
 
-static int lm49453_probe(struct snd_soc_codec *codec)
-{
-        struct lm49453_priv *lm49453 = snd_soc_codec_get_drvdata(codec);
-        int ret = 0;
-
-        codec->control_data = lm49453->regmap;
-
-        ret = snd_soc_codec_set_cache_io(codec, 8, 8, SND_SOC_REGMAP);
-        if (ret < 0) {
-                dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret);
-                return ret;
-        }
-
-        return 0;
-}
-
 /* power down chip */
 static int lm49453_remove(struct snd_soc_codec *codec)
 {
@@ -1433,7 +1415,6 @@ static int lm49453_remove(struct snd_soc_codec *codec)
 }
 
 static struct snd_soc_codec_driver soc_codec_dev_lm49453 = {
-        .probe = lm49453_probe,
         .remove = lm49453_remove,
         .suspend = lm49453_suspend,
         .resume = lm49453_resume,