From a5c95e90c1baa9c1114875264bbd283526eb8377 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Mon, 23 Jun 2008 14:51:29 +0100 Subject: 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 Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela --- sound/soc/codecs/wm8510.c | 25 +++---------------------- 1 file changed, 3 insertions(+), 22 deletions(-) (limited to 'sound/soc/codecs/wm8510.c') diff --git a/sound/soc/codecs/wm8510.c b/sound/soc/codecs/wm8510.c index 152e6f21154f..b549f6753aba 100644 --- a/sound/soc/codecs/wm8510.c +++ b/sound/soc/codecs/wm8510.c @@ -30,25 +30,6 @@ #define AUDIO_NAME "wm8510" #define WM8510_VERSION "0.6" -/* - * Debug - */ - -#define WM8510_DEBUG 0 - -#ifdef WM8510_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) - struct snd_soc_codec_device soc_codec_dev_wm8510; /* @@ -721,13 +702,13 @@ static int wm8510_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 = wm8510_init(socdev); if (ret < 0) { - err("failed to initialise WM8510\n"); + pr_err("failed to initialise WM8510\n"); goto err; } return ret; @@ -777,7 +758,7 @@ static int wm8510_probe(struct platform_device *pdev) struct snd_soc_codec *codec; int ret = 0; - info("WM8510 Audio Codec %s", WM8510_VERSION); + pr_info("WM8510 Audio Codec %s", WM8510_VERSION); setup = socdev->codec_data; codec = kzalloc(sizeof(struct snd_soc_codec), GFP_KERNEL); -- cgit v1.2.3