diff options
author | Denis Carikli <denis@eukrea.com> | 2013-10-24 08:13:48 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-10-24 08:22:30 -0400 |
commit | 154bab12e1db824ad12ffd6df2d213dfb3d09878 (patch) | |
tree | 54e4f35c72ac0b66d3048aebb7f19f451a30920c /sound/soc | |
parent | 1abe729f783fece81d93e9a0253fd8079f19d7f6 (diff) |
ASoC: eukrea-tlv320: Use dev_err instead of pr_err.
It also contains a minor style cleanup.
Signed-off-by: Denis Carikli <denis@eukrea.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc')
-rw-r--r-- | sound/soc/fsl/eukrea-tlv320.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/sound/soc/fsl/eukrea-tlv320.c b/sound/soc/fsl/eukrea-tlv320.c index 9a4a0ca2c1de..5983740be123 100644 --- a/sound/soc/fsl/eukrea-tlv320.c +++ b/sound/soc/fsl/eukrea-tlv320.c | |||
@@ -42,7 +42,8 @@ static int eukrea_tlv320_hw_params(struct snd_pcm_substream *substream, | |||
42 | SND_SOC_DAIFMT_NB_NF | | 42 | SND_SOC_DAIFMT_NB_NF | |
43 | SND_SOC_DAIFMT_CBM_CFM); | 43 | SND_SOC_DAIFMT_CBM_CFM); |
44 | if (ret) { | 44 | if (ret) { |
45 | pr_err("%s: failed set cpu dai format\n", __func__); | 45 | dev_err(cpu_dai->dev, |
46 | "Failed to set the cpu dai format.\n"); | ||
46 | return ret; | 47 | return ret; |
47 | } | 48 | } |
48 | 49 | ||
@@ -50,14 +51,16 @@ static int eukrea_tlv320_hw_params(struct snd_pcm_substream *substream, | |||
50 | SND_SOC_DAIFMT_NB_NF | | 51 | SND_SOC_DAIFMT_NB_NF | |
51 | SND_SOC_DAIFMT_CBM_CFM); | 52 | SND_SOC_DAIFMT_CBM_CFM); |
52 | if (ret) { | 53 | if (ret) { |
53 | pr_err("%s: failed set codec dai format\n", __func__); | 54 | dev_err(cpu_dai->dev, |
55 | "Failed to set the codec format.\n"); | ||
54 | return ret; | 56 | return ret; |
55 | } | 57 | } |
56 | 58 | ||
57 | ret = snd_soc_dai_set_sysclk(codec_dai, 0, | 59 | ret = snd_soc_dai_set_sysclk(codec_dai, 0, |
58 | CODEC_CLOCK, SND_SOC_CLOCK_OUT); | 60 | CODEC_CLOCK, SND_SOC_CLOCK_OUT); |
59 | if (ret) { | 61 | if (ret) { |
60 | pr_err("%s: failed setting codec sysclk\n", __func__); | 62 | dev_err(cpu_dai->dev, |
63 | "Failed to set the codec sysclk.\n"); | ||
61 | return ret; | 64 | return ret; |
62 | } | 65 | } |
63 | snd_soc_dai_set_tdm_slot(cpu_dai, 0xffffffc, 0xffffffc, 2, 0); | 66 | snd_soc_dai_set_tdm_slot(cpu_dai, 0xffffffc, 0xffffffc, 2, 0); |
@@ -65,7 +68,8 @@ static int eukrea_tlv320_hw_params(struct snd_pcm_substream *substream, | |||
65 | ret = snd_soc_dai_set_sysclk(cpu_dai, IMX_SSP_SYS_CLK, 0, | 68 | ret = snd_soc_dai_set_sysclk(cpu_dai, IMX_SSP_SYS_CLK, 0, |
66 | SND_SOC_CLOCK_IN); | 69 | SND_SOC_CLOCK_IN); |
67 | if (ret) { | 70 | if (ret) { |
68 | pr_err("can't set CPU system clock IMX_SSP_SYS_CLK\n"); | 71 | dev_err(cpu_dai->dev, |
72 | "Can't set the IMX_SSP_SYS_CLK CPU system clock.\n"); | ||
69 | return ret; | 73 | return ret; |
70 | } | 74 | } |
71 | 75 | ||
@@ -155,7 +159,8 @@ static struct platform_driver eukrea_tlv320_driver = { | |||
155 | .owner = THIS_MODULE, | 159 | .owner = THIS_MODULE, |
156 | }, | 160 | }, |
157 | .probe = eukrea_tlv320_probe, | 161 | .probe = eukrea_tlv320_probe, |
158 | .remove = eukrea_tlv320_remove,}; | 162 | .remove = eukrea_tlv320_remove, |
163 | }; | ||
159 | 164 | ||
160 | module_platform_driver(eukrea_tlv320_driver); | 165 | module_platform_driver(eukrea_tlv320_driver); |
161 | 166 | ||