ASoC: Use our registration function for S3C64xx

Make sure we get the DAI operations initialised.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

diff --git a/sound/soc/s3c24xx/s3c-i2s-v2.c b/sound/soc/s3c24xx/s3c-i2s-v2.c
index aeea49cbe74a4f8d5a361910da6b13de806b8b2c..ab680aac3fcb0edb064e6bad6ee2f03c7b03f707 100644 (file)
--- a/sound/soc/s3c24xx/s3c-i2s-v2.c
+++ b/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/sound/soc/s3c24xx/s3c64xx-i2s.c b/sound/soc/s3c24xx/s3c64xx-i2s.c
index c33524803b3e2a97a0003853bae3d22e3bfb798c..1345fbdca700a8ac0b7f1b461260d1d52c27d634 100644 (file)
--- a/sound/soc/s3c24xx/s3c64xx-i2s.c
+++ b/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;