aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorLiam Girdwood <lrg@ti.com>2012-07-06 11:54:52 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-07-06 13:59:15 -0400
commit5cb9b7482270972421a1f2d4145efc60d7ee1176 (patch)
treeb2ea2fe94605563d1eacb5a72d5a7c8974621e59 /sound
parentbcbf4a69ee6ca68d62440bc936a3c977c2141a66 (diff)
ASoC: pcm: Clean up logging in soc_new_pcm()
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>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/soc-pcm.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index 48fd15b312c1..7063b8f926c6 100644
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -2003,7 +2003,6 @@ static int dpcm_fe_dai_close(struct snd_pcm_substream *fe_substream)
2003/* create a new pcm */ 2003/* create a new pcm */
2004int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num) 2004int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num)
2005{ 2005{
2006 struct snd_soc_codec *codec = rtd->codec;
2007 struct snd_soc_platform *platform = rtd->platform; 2006 struct snd_soc_platform *platform = rtd->platform;
2008 struct snd_soc_dai *codec_dai = rtd->codec_dai; 2007 struct snd_soc_dai *codec_dai = rtd->codec_dai;
2009 struct snd_soc_dai *cpu_dai = rtd->cpu_dai; 2008 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)
2042 capture, &pcm); 2041 capture, &pcm);
2043 } 2042 }
2044 if (ret < 0) { 2043 if (ret < 0) {
2045 printk(KERN_ERR "asoc: can't create pcm for codec %s\n", codec->name); 2044 dev_err(rtd->card->dev, "can't create pcm for %s\n",
2045 rtd->dai_link->name);
2046 return ret; 2046 return ret;
2047 } 2047 }
2048 dev_dbg(rtd->card->dev, "registered pcm #%d %s\n",num, new_name); 2048 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)
2099 if (platform->driver->pcm_new) { 2099 if (platform->driver->pcm_new) {
2100 ret = platform->driver->pcm_new(rtd); 2100 ret = platform->driver->pcm_new(rtd);
2101 if (ret < 0) { 2101 if (ret < 0) {
2102 pr_err("asoc: platform pcm constructor failed\n"); 2102 dev_err(platform->dev, "pcm constructor failed\n");
2103 return ret; 2103 return ret;
2104 } 2104 }
2105 } 2105 }
2106 2106
2107 pcm->private_free = platform->driver->pcm_free; 2107 pcm->private_free = platform->driver->pcm_free;
2108out: 2108out:
2109 printk(KERN_INFO "asoc: %s <-> %s mapping ok\n", codec_dai->name, 2109 dev_info(rtd->card->dev, " %s <-> %s mapping ok\n", codec_dai->name,
2110 cpu_dai->name); 2110 cpu_dai->name);
2111 return ret; 2111 return ret;
2112} 2112}