From 041749c71faee69e7fc9f202367fbb4706eaf19f Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Mon, 27 Apr 2009 20:24:15 +0100
Subject: [PATCH] --- yaml --- r: 148226 b: refs/heads/master c:
 a7be4d92d989fc53d840d24cba2ebea9e5ad8480 h: refs/heads/master v: v3

---
 [refs]                                |  2 +-
 trunk/sound/soc/s3c24xx/s3c-i2s-v2.c  | 18 ++++++------------
 trunk/sound/soc/s3c24xx/s3c64xx-i2s.c |  2 +-
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index 2a9c0a5f3dbe..5c192a64eb2c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5c556a6e190897a0f1ff14e13722591828412031
+refs/heads/master: a7be4d92d989fc53d840d24cba2ebea9e5ad8480
diff --git a/trunk/sound/soc/s3c24xx/s3c-i2s-v2.c b/trunk/sound/soc/s3c24xx/s3c-i2s-v2.c
index aeea49cbe74a..ab680aac3fcb 100644
--- a/trunk/sound/soc/s3c24xx/s3c-i2s-v2.c
+++ b/trunk/sound/soc/s3c24xx/s3c-i2s-v2.c
@@ -105,9 +105,7 @@ void s3c2412_snd_txctrl(struct s3c_i2sv2_info *i2s, int on)
 			break;
 
 		default:
-			dev_err(i2s->dev, "TXEN: Invalid MODE %x in IISMOD\n",
-				mod & S3C2412_IISMOD_MODE_MASK);
-			break;
+			dev_err(i2s->dev, "TXEN: Invalid MODE in IISMOD\n");
 		}
 
 		writel(con, regs + S3C2412_IISCON);
@@ -134,9 +132,7 @@ void s3c2412_snd_txctrl(struct s3c_i2sv2_info *i2s, int on)
 			break;
 
 		default:
-			dev_err(i2s->dev, "TXDIS: Invalid MODE %xin IISMOD\n",
-				mod & S3C2412_IISMOD_MODE_MASK);
-			break;
+			dev_err(i2s->dev, "TXDIS: Invalid MODE in IISMOD\n");
 		}
 
 		writel(mod, regs + S3C2412_IISMOD);
@@ -179,8 +175,7 @@ void s3c2412_snd_rxctrl(struct s3c_i2sv2_info *i2s, int on)
 			break;
 
 		default:
-			dev_err(i2s->dev, "RXEN: Invalid MODE %x in IISMOD\n",
-				mod & S3C2412_IISMOD_MODE_MASK);
+			dev_err(i2s->dev, "RXEN: Invalid MODE in IISMOD\n");
 		}
 
 		writel(mod, regs + S3C2412_IISMOD);
@@ -204,8 +199,7 @@ void s3c2412_snd_rxctrl(struct s3c_i2sv2_info *i2s, int on)
 			break;
 
 		default:
-			dev_err(i2s->dev, "RXEN: Invalid MODE %x in IISMOD\n",
-				mod & S3C2412_IISMOD_MODE_MASK);
+			dev_err(i2s->dev, "RXEN: Invalid MODE in IISMOD\n");
 		}
 
 		writel(con, regs + S3C2412_IISCON);
@@ -287,7 +281,7 @@ static int s3c2412_i2s_set_fmt(struct snd_soc_dai *cpu_dai,
 		iismod |= IISMOD_MASTER;
 		break;
 	default:
-		pr_err("unknwon master/slave format\n");
+		pr_debug("unknwon master/slave format\n");
 		return -EINVAL;
 	}
 
@@ -304,7 +298,7 @@ static int s3c2412_i2s_set_fmt(struct snd_soc_dai *cpu_dai,
 		iismod |= S3C2412_IISMOD_SDF_IIS;
 		break;
 	default:
-		pr_err("Unknown data format\n");
+		pr_debug("Unknown data format\n");
 		return -EINVAL;
 	}
 
diff --git a/trunk/sound/soc/s3c24xx/s3c64xx-i2s.c b/trunk/sound/soc/s3c24xx/s3c64xx-i2s.c
index c33524803b3e..1345fbdca700 100644
--- a/trunk/sound/soc/s3c24xx/s3c64xx-i2s.c
+++ b/trunk/sound/soc/s3c24xx/s3c64xx-i2s.c
@@ -225,7 +225,7 @@ static __devinit int s3c64xx_iis_dev_probe(struct platform_device *pdev)
 	if (ret)
 		goto err_clk;
 
-	ret = snd_soc_register_dai(dai);
+	ret = s3c_i2sv2_register_dai(dai);
 	if (ret != 0)
 		goto err_i2sv2;