summaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/wm8990.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2008-06-23 14:51:29 +0100
committerJaroslav Kysela <perex@perex.cz>2008-06-26 09:02:05 +0200
commita5c95e90c1baa9c1114875264bbd283526eb8377 (patch)
tree6de6ac17bd6e66548867db6f901605ca7192c65d /sound/soc/codecs/wm8990.c
parent796d2ca84859d1fdb11ff06cd9707ffab5642fca (diff)
ALSA: ASoC: Replace custom debug macros with pr_ equivalents
Several ASoC codec drivers use custom macros equivalent to the standard pr_ macros, most of which are not actually used. Replace these custom macros with the standard ones. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Diffstat (limited to 'sound/soc/codecs/wm8990.c')
-rw-r--r--sound/soc/codecs/wm8990.c25
1 files changed, 3 insertions, 22 deletions
diff --git a/sound/soc/codecs/wm8990.c b/sound/soc/codecs/wm8990.c
index a7d25e2f252..a1371b73ba7 100644
--- a/sound/soc/codecs/wm8990.c
+++ b/sound/soc/codecs/wm8990.c
@@ -33,25 +33,6 @@
#define AUDIO_NAME "wm8990"
#define WM8990_VERSION "0.2"
-/*
- * Debug
- */
-
-#define WM8990_DEBUG 0
-
-#ifdef WM8990_DEBUG
-#define dbg(format, arg...) \
- printk(KERN_DEBUG AUDIO_NAME ": " format "\n" , ## arg)
-#else
-#define dbg(format, arg...) do {} while (0)
-#endif
-#define err(format, arg...) \
- printk(KERN_ERR AUDIO_NAME ": " format "\n" , ## arg)
-#define info(format, arg...) \
- printk(KERN_INFO AUDIO_NAME ": " format "\n" , ## arg)
-#define warn(format, arg...) \
- printk(KERN_WARNING AUDIO_NAME ": " format "\n" , ## arg)
-
/* codec private data */
struct wm8990_priv {
unsigned int sysclk;
@@ -1524,13 +1505,13 @@ static int wm8990_codec_probe(struct i2c_adapter *adap, int addr, int kind)
ret = i2c_attach_client(i2c);
if (ret < 0) {
- err("failed to attach codec at addr %x\n", addr);
+ pr_err("failed to attach codec at addr %x\n", addr);
goto err;
}
ret = wm8990_init(socdev);
if (ret < 0) {
- err("failed to initialise WM8990\n");
+ pr_err("failed to initialise WM8990\n");
goto err;
}
return ret;
@@ -1579,7 +1560,7 @@ static int wm8990_probe(struct platform_device *pdev)
struct wm8990_priv *wm8990;
int ret = 0;
- info("WM8990 Audio Codec %s\n", WM8990_VERSION);
+ pr_info("WM8990 Audio Codec %s\n", WM8990_VERSION);
setup = socdev->codec_data;
codec = kzalloc(sizeof(struct snd_soc_codec), GFP_KERNEL);