3 files changed, 4 insertions, 8 deletions

diff --git a/sound/soc/ep93xx/edb93xx.c b/sound/soc/ep93xx/edb93xx.c
index bae5cbbbd2b2..e01cb02abd3a 100644
--- a/sound/soc/ep93xx/edb93xx.c
+++ b/sound/soc/ep93xx/edb93xx.c
@@ -85,9 +85,7 @@ static int __devinit edb93xx_probe(struct platform_device *pdev)
         struct snd_soc_card *card = &snd_soc_edb93xx;
         int ret;
 
-        ret = ep93xx_i2s_acquire(EP93XX_SYSCON_DEVCFG_I2SONAC97,
-                                 EP93XX_SYSCON_I2SCLKDIV_ORIDE |
-                                 EP93XX_SYSCON_I2SCLKDIV_SPOL);
+        ret = ep93xx_i2s_acquire();
         if (ret)
                 return ret;
 
diff --git a/sound/soc/ep93xx/snappercl15.c b/sound/soc/ep93xx/snappercl15.c
index ccae34a3f280..a193cea3cf3c 100644
--- a/sound/soc/ep93xx/snappercl15.c
+++ b/sound/soc/ep93xx/snappercl15.c
@@ -103,9 +103,7 @@ static int __devinit snappercl15_probe(struct platform_device *pdev)
         struct snd_soc_card *card = &snd_soc_snappercl15;
         int ret;
 
-        ret = ep93xx_i2s_acquire(EP93XX_SYSCON_DEVCFG_I2SONAC97,
-                                 EP93XX_SYSCON_I2SCLKDIV_ORIDE |
-                                 EP93XX_SYSCON_I2SCLKDIV_SPOL);
+        ret = ep93xx_i2s_acquire();
         if (ret)
                 return ret;
 
diff --git a/sound/soc/samsung/neo1973_wm8753.c b/sound/soc/samsung/neo1973_wm8753.c
index c6012ff5bd3e..d23b19a59d83 100644
--- a/sound/soc/samsung/neo1973_wm8753.c
+++ b/sound/soc/samsung/neo1973_wm8753.c
@@ -367,7 +367,7 @@ static struct snd_soc_dai_link neo1973_dai[] = {
         .platform_name = "samsung-audio",
         .cpu_dai_name = "s3c24xx-iis",
         .codec_dai_name = "wm8753-hifi",
-        .codec_name = "wm8753-codec.0-001a",
+        .codec_name = "wm8753.0-001a",
         .init = neo1973_wm8753_init,
         .ops = &neo1973_hifi_ops,
 },
@@ -376,7 +376,7 @@ static struct snd_soc_dai_link neo1973_dai[] = {
         .stream_name = "Voice",
         .cpu_dai_name = "dfbmcs320-pcm",
         .codec_dai_name = "wm8753-voice",
-        .codec_name = "wm8753-codec.0-001a",
+        .codec_name = "wm8753.0-001a",
         .ops = &neo1973_voice_ops,
 },
 };