diff options
-rw-r--r-- | sound/soc/atmel/sam9x5_wm8731.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/sound/soc/atmel/sam9x5_wm8731.c b/sound/soc/atmel/sam9x5_wm8731.c index ccdf547f4d8c..e6c303ab869d 100644 --- a/sound/soc/atmel/sam9x5_wm8731.c +++ b/sound/soc/atmel/sam9x5_wm8731.c | |||
@@ -49,13 +49,13 @@ static int sam9x5_wm8731_init(struct snd_soc_pcm_runtime *rtd) | |||
49 | struct device *dev = rtd->dev; | 49 | struct device *dev = rtd->dev; |
50 | int ret; | 50 | int ret; |
51 | 51 | ||
52 | dev_dbg(dev, "ASoC: %s called\n", __func__); | 52 | dev_dbg(dev, "%s called\n", __func__); |
53 | 53 | ||
54 | /* set the codec system clock for DAC and ADC */ | 54 | /* set the codec system clock for DAC and ADC */ |
55 | ret = snd_soc_dai_set_sysclk(codec_dai, WM8731_SYSCLK_XTAL, | 55 | ret = snd_soc_dai_set_sysclk(codec_dai, WM8731_SYSCLK_XTAL, |
56 | MCLK_RATE, SND_SOC_CLOCK_IN); | 56 | MCLK_RATE, SND_SOC_CLOCK_IN); |
57 | if (ret < 0) { | 57 | if (ret < 0) { |
58 | dev_err(dev, "ASoC: Failed to set WM8731 SYSCLK: %d\n", ret); | 58 | dev_err(dev, "Failed to set WM8731 SYSCLK: %d\n", ret); |
59 | return ret; | 59 | return ret; |
60 | } | 60 | } |
61 | 61 | ||
@@ -146,8 +146,7 @@ static int sam9x5_wm8731_driver_probe(struct platform_device *pdev) | |||
146 | 146 | ||
147 | ret = atmel_ssc_set_audio(priv->ssc_id); | 147 | ret = atmel_ssc_set_audio(priv->ssc_id); |
148 | if (ret != 0) { | 148 | if (ret != 0) { |
149 | dev_err(&pdev->dev, | 149 | dev_err(&pdev->dev, "Failed to set SSC %d for audio: %d\n", |
150 | "ASoC: Failed to set SSC %d for audio: %d\n", | ||
151 | ret, priv->ssc_id); | 150 | ret, priv->ssc_id); |
152 | goto out; | 151 | goto out; |
153 | } | 152 | } |
@@ -157,12 +156,11 @@ static int sam9x5_wm8731_driver_probe(struct platform_device *pdev) | |||
157 | 156 | ||
158 | ret = snd_soc_register_card(card); | 157 | ret = snd_soc_register_card(card); |
159 | if (ret) { | 158 | if (ret) { |
160 | dev_err(&pdev->dev, | 159 | dev_err(&pdev->dev, "Platform device allocation failed\n"); |
161 | "ASoC: Platform device allocation failed\n"); | ||
162 | goto out_put_audio; | 160 | goto out_put_audio; |
163 | } | 161 | } |
164 | 162 | ||
165 | dev_dbg(&pdev->dev, "ASoC: %s ok\n", __func__); | 163 | dev_dbg(&pdev->dev, "%s ok\n", __func__); |
166 | 164 | ||
167 | return ret; | 165 | return ret; |
168 | 166 | ||