ASoC: pcm: Clean up logging in soc_new_pcm()
authorLiam Girdwood <lrg@ti.com>
Fri, 6 Jul 2012 15:54:52 +0000 (16:54 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 6 Jul 2012 17:59:15 +0000 (18:59 +0100)
Use dev_ style logging throughout soc_new_pcm()

Signed-off-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
sound/soc/soc-pcm.c

index 48fd15b312c1e46d06945640dcbc2df0cd1eabe2..7063b8f926c6334ba3aa63af0eb38cdb94b38c18 100644 (file)
@@ -2003,7 +2003,6 @@ static int dpcm_fe_dai_close(struct snd_pcm_substream *fe_substream)
 /* create a new pcm */
 int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num)
 {
-       struct snd_soc_codec *codec = rtd->codec;
        struct snd_soc_platform *platform = rtd->platform;
        struct snd_soc_dai *codec_dai = rtd->codec_dai;
        struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
@@ -2042,7 +2041,8 @@ int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num)
                        capture, &pcm);
        }
        if (ret < 0) {
-               printk(KERN_ERR "asoc: can't create pcm for codec %s\n", codec->name);
+               dev_err(rtd->card->dev, "can't create pcm for %s\n",
+                       rtd->dai_link->name);
                return ret;
        }
        dev_dbg(rtd->card->dev, "registered pcm #%d %s\n",num, new_name);
@@ -2099,14 +2099,14 @@ int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num)
        if (platform->driver->pcm_new) {
                ret = platform->driver->pcm_new(rtd);
                if (ret < 0) {
-                       pr_err("asoc: platform pcm constructor failed\n");
+                       dev_err(platform->dev, "pcm constructor failed\n");
                        return ret;
                }
        }
 
        pcm->private_free = platform->driver->pcm_free;
 out:
-       printk(KERN_INFO "asoc: %s <-> %s mapping ok\n", codec_dai->name,
+       dev_info(rtd->card->dev, " %s <-> %s mapping ok\n", codec_dai->name,
                cpu_dai->name);
        return ret;
 }