summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: bc72fe0)
raw | patch | inline | side by side (parent: bc72fe0)
author | Stephen Warren <swarren@nvidia.com> | |
Fri, 28 Jan 2011 21:26:39 +0000 (14:26 -0700) | ||
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | |
Mon, 31 Jan 2011 13:16:19 +0000 (13:16 +0000) |
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>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
sound/soc/tegra/harmony.c | patch | blob | history |
index b5311a3ee95f49ae5994e0c2c7790eb8fbf0ab70..76793a93c13343eca73494c996e770635599c1a7 100644 (file)
#include "tegra_asoc_utils.h"
#define DRV_NAME "tegra-snd-harmony"
-#define PREFIX DRV_NAME ": "
struct tegra_harmony {
struct harmony_audio_platform_data *pdata;
struct snd_soc_pcm_runtime *rtd = substream->private_data;
struct snd_soc_dai *codec_dai = rtd->codec_dai;
struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
+ struct snd_soc_codec *codec = rtd->codec;
+ struct snd_soc_card *card = codec->card;
int srate, mclk, mclk_change;
int err;
err = tegra_asoc_utils_set_rate(srate, mclk, &mclk_change);
if (err < 0) {
- pr_err(PREFIX "Can't configure clocks\n");
+ dev_err(card->dev, "Can't configure clocks\n");
return err;
}
SND_SOC_DAIFMT_NB_NF |
SND_SOC_DAIFMT_CBS_CFS);
if (err < 0) {
- pr_err(PREFIX "codec_dai fmt not set\n");
+ dev_err(card->dev, "codec_dai fmt not set\n");
return err;
}
SND_SOC_DAIFMT_NB_NF |
SND_SOC_DAIFMT_CBS_CFS);
if (err < 0) {
- pr_err(PREFIX "cpu_dai fmt not set\n");
+ dev_err(card->dev, "cpu_dai fmt not set\n");
return err;
}
err = snd_soc_dai_set_sysclk(codec_dai, 0, mclk,
SND_SOC_CLOCK_IN);
if (err < 0) {
- pr_err(PREFIX "codec_dai clock not set\n");
+ dev_err(card->dev, "codec_dai clock not set\n");
return err;
}
}