diff options
author | Stephen Warren <swarren@nvidia.com> | 2011-01-28 16:26:39 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-01-31 08:16:19 -0500 |
commit | c244d477b7a5e0060b05d6ef90b7b29ef72a2188 (patch) | |
tree | 22aaf3dd939efa2fc1900f8bd9011b4fd164125a /sound/soc/tegra | |
parent | bc72fe0c0e90b1ff9c12037321626aa5a4b061c3 (diff) |
ASoC: Tegra: Harmony: Use dev_err not pr_err
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/tegra')
-rw-r--r-- | sound/soc/tegra/harmony.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sound/soc/tegra/harmony.c b/sound/soc/tegra/harmony.c index b5311a3ee95f..76793a93c133 100644 --- a/sound/soc/tegra/harmony.c +++ b/sound/soc/tegra/harmony.c | |||
@@ -48,7 +48,6 @@ | |||
48 | #include "tegra_asoc_utils.h" | 48 | #include "tegra_asoc_utils.h" |
49 | 49 | ||
50 | #define DRV_NAME "tegra-snd-harmony" | 50 | #define DRV_NAME "tegra-snd-harmony" |
51 | #define PREFIX DRV_NAME ": " | ||
52 | 51 | ||
53 | struct tegra_harmony { | 52 | struct tegra_harmony { |
54 | struct harmony_audio_platform_data *pdata; | 53 | struct harmony_audio_platform_data *pdata; |
@@ -61,6 +60,8 @@ static int harmony_asoc_hw_params(struct snd_pcm_substream *substream, | |||
61 | struct snd_soc_pcm_runtime *rtd = substream->private_data; | 60 | struct snd_soc_pcm_runtime *rtd = substream->private_data; |
62 | struct snd_soc_dai *codec_dai = rtd->codec_dai; | 61 | struct snd_soc_dai *codec_dai = rtd->codec_dai; |
63 | struct snd_soc_dai *cpu_dai = rtd->cpu_dai; | 62 | struct snd_soc_dai *cpu_dai = rtd->cpu_dai; |
63 | struct snd_soc_codec *codec = rtd->codec; | ||
64 | struct snd_soc_card *card = codec->card; | ||
64 | int srate, mclk, mclk_change; | 65 | int srate, mclk, mclk_change; |
65 | int err; | 66 | int err; |
66 | 67 | ||
@@ -81,7 +82,7 @@ static int harmony_asoc_hw_params(struct snd_pcm_substream *substream, | |||
81 | 82 | ||
82 | err = tegra_asoc_utils_set_rate(srate, mclk, &mclk_change); | 83 | err = tegra_asoc_utils_set_rate(srate, mclk, &mclk_change); |
83 | if (err < 0) { | 84 | if (err < 0) { |
84 | pr_err(PREFIX "Can't configure clocks\n"); | 85 | dev_err(card->dev, "Can't configure clocks\n"); |
85 | return err; | 86 | return err; |
86 | } | 87 | } |
87 | 88 | ||
@@ -90,7 +91,7 @@ static int harmony_asoc_hw_params(struct snd_pcm_substream *substream, | |||
90 | SND_SOC_DAIFMT_NB_NF | | 91 | SND_SOC_DAIFMT_NB_NF | |
91 | SND_SOC_DAIFMT_CBS_CFS); | 92 | SND_SOC_DAIFMT_CBS_CFS); |
92 | if (err < 0) { | 93 | if (err < 0) { |
93 | pr_err(PREFIX "codec_dai fmt not set\n"); | 94 | dev_err(card->dev, "codec_dai fmt not set\n"); |
94 | return err; | 95 | return err; |
95 | } | 96 | } |
96 | 97 | ||
@@ -99,7 +100,7 @@ static int harmony_asoc_hw_params(struct snd_pcm_substream *substream, | |||
99 | SND_SOC_DAIFMT_NB_NF | | 100 | SND_SOC_DAIFMT_NB_NF | |
100 | SND_SOC_DAIFMT_CBS_CFS); | 101 | SND_SOC_DAIFMT_CBS_CFS); |
101 | if (err < 0) { | 102 | if (err < 0) { |
102 | pr_err(PREFIX "cpu_dai fmt not set\n"); | 103 | dev_err(card->dev, "cpu_dai fmt not set\n"); |
103 | return err; | 104 | return err; |
104 | } | 105 | } |
105 | 106 | ||
@@ -107,7 +108,7 @@ static int harmony_asoc_hw_params(struct snd_pcm_substream *substream, | |||
107 | err = snd_soc_dai_set_sysclk(codec_dai, 0, mclk, | 108 | err = snd_soc_dai_set_sysclk(codec_dai, 0, mclk, |
108 | SND_SOC_CLOCK_IN); | 109 | SND_SOC_CLOCK_IN); |
109 | if (err < 0) { | 110 | if (err < 0) { |
110 | pr_err(PREFIX "codec_dai clock not set\n"); | 111 | dev_err(card->dev, "codec_dai clock not set\n"); |
111 | return err; | 112 | return err; |
112 | } | 113 | } |
113 | } | 114 | } |