diff options
-rw-r--r-- | sound/soc/atmel/sam9g20_wm8731.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/sound/soc/atmel/sam9g20_wm8731.c b/sound/soc/atmel/sam9g20_wm8731.c index d7469cdd90dc..98f93e79c654 100644 --- a/sound/soc/atmel/sam9g20_wm8731.c +++ b/sound/soc/atmel/sam9g20_wm8731.c | |||
@@ -110,16 +110,15 @@ static const struct snd_soc_dapm_route intercon[] = { | |||
110 | static int at91sam9g20ek_wm8731_init(struct snd_soc_pcm_runtime *rtd) | 110 | static int at91sam9g20ek_wm8731_init(struct snd_soc_pcm_runtime *rtd) |
111 | { | 111 | { |
112 | struct snd_soc_dai *codec_dai = rtd->codec_dai; | 112 | struct snd_soc_dai *codec_dai = rtd->codec_dai; |
113 | struct device *dev = rtd->dev; | ||
113 | int ret; | 114 | int ret; |
114 | 115 | ||
115 | printk(KERN_DEBUG | 116 | dev_dbg(dev, "%s called\n", __func__); |
116 | "at91sam9g20ek_wm8731 " | ||
117 | ": at91sam9g20ek_wm8731_init() called\n"); | ||
118 | 117 | ||
119 | ret = snd_soc_dai_set_sysclk(codec_dai, WM8731_SYSCLK_MCLK, | 118 | ret = snd_soc_dai_set_sysclk(codec_dai, WM8731_SYSCLK_MCLK, |
120 | MCLK_RATE, SND_SOC_CLOCK_IN); | 119 | MCLK_RATE, SND_SOC_CLOCK_IN); |
121 | if (ret < 0) { | 120 | if (ret < 0) { |
122 | printk(KERN_ERR "Failed to set WM8731 SYSCLK: %d\n", ret); | 121 | dev_err(dev, "Failed to set WM8731 SYSCLK: %d\n", ret); |
123 | return ret; | 122 | return ret; |
124 | } | 123 | } |
125 | 124 | ||
@@ -179,21 +178,21 @@ static int at91sam9g20ek_audio_probe(struct platform_device *pdev) | |||
179 | */ | 178 | */ |
180 | mclk = clk_get(NULL, "pck0"); | 179 | mclk = clk_get(NULL, "pck0"); |
181 | if (IS_ERR(mclk)) { | 180 | if (IS_ERR(mclk)) { |
182 | printk(KERN_ERR "ASoC: Failed to get MCLK\n"); | 181 | dev_err(&pdev->dev, "Failed to get MCLK\n"); |
183 | ret = PTR_ERR(mclk); | 182 | ret = PTR_ERR(mclk); |
184 | goto err; | 183 | goto err; |
185 | } | 184 | } |
186 | 185 | ||
187 | pllb = clk_get(NULL, "pllb"); | 186 | pllb = clk_get(NULL, "pllb"); |
188 | if (IS_ERR(pllb)) { | 187 | if (IS_ERR(pllb)) { |
189 | printk(KERN_ERR "ASoC: Failed to get PLLB\n"); | 188 | dev_err(&pdev->dev, "Failed to get PLLB\n"); |
190 | ret = PTR_ERR(pllb); | 189 | ret = PTR_ERR(pllb); |
191 | goto err_mclk; | 190 | goto err_mclk; |
192 | } | 191 | } |
193 | ret = clk_set_parent(mclk, pllb); | 192 | ret = clk_set_parent(mclk, pllb); |
194 | clk_put(pllb); | 193 | clk_put(pllb); |
195 | if (ret != 0) { | 194 | if (ret != 0) { |
196 | printk(KERN_ERR "ASoC: Failed to set MCLK parent\n"); | 195 | dev_err(&pdev->dev, "Failed to set MCLK parent\n"); |
197 | goto err_mclk; | 196 | goto err_mclk; |
198 | } | 197 | } |
199 | 198 | ||
@@ -236,7 +235,7 @@ static int at91sam9g20ek_audio_probe(struct platform_device *pdev) | |||
236 | 235 | ||
237 | ret = snd_soc_register_card(card); | 236 | ret = snd_soc_register_card(card); |
238 | if (ret) { | 237 | if (ret) { |
239 | printk(KERN_ERR "ASoC: snd_soc_register_card() failed\n"); | 238 | dev_err(&pdev->dev, "snd_soc_register_card() failed\n"); |
240 | } | 239 | } |
241 | 240 | ||
242 | return ret; | 241 | return ret; |