aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/wm8510.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2008-06-23 09:51:29 -0400
committerJaroslav Kysela <perex@perex.cz>2008-06-26 03:02:05 -0400
commita5c95e90c1baa9c1114875264bbd283526eb8377 (patch)
tree6de6ac17bd6e66548867db6f901605ca7192c65d /sound/soc/codecs/wm8510.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/wm8510.c')
-rw-r--r--sound/soc/codecs/wm8510.c25
1 files changed, 3 insertions, 22 deletions
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 @@
30#define AUDIO_NAME "wm8510" 30#define AUDIO_NAME "wm8510"
31#define WM8510_VERSION "0.6" 31#define WM8510_VERSION "0.6"
32 32
33/*
34 * Debug
35 */
36
37#define WM8510_DEBUG 0
38
39#ifdef WM8510_DEBUG
40#define dbg(format, arg...) \
41 printk(KERN_DEBUG AUDIO_NAME ": " format "\n" , ## arg)
42#else
43#define dbg(format, arg...) do {} while (0)
44#endif
45#define err(format, arg...) \
46 printk(KERN_ERR AUDIO_NAME ": " format "\n" , ## arg)
47#define info(format, arg...) \
48 printk(KERN_INFO AUDIO_NAME ": " format "\n" , ## arg)
49#define warn(format, arg...) \
50 printk(KERN_WARNING AUDIO_NAME ": " format "\n" , ## arg)
51
52struct snd_soc_codec_device soc_codec_dev_wm8510; 33struct snd_soc_codec_device soc_codec_dev_wm8510;
53 34
54/* 35/*
@@ -721,13 +702,13 @@ static int wm8510_codec_probe(struct i2c_adapter *adap, int addr, int kind)
721 702
722 ret = i2c_attach_client(i2c); 703 ret = i2c_attach_client(i2c);
723 if (ret < 0) { 704 if (ret < 0) {
724 err("failed to attach codec at addr %x\n", addr); 705 pr_err("failed to attach codec at addr %x\n", addr);
725 goto err; 706 goto err;
726 } 707 }
727 708
728 ret = wm8510_init(socdev); 709 ret = wm8510_init(socdev);
729 if (ret < 0) { 710 if (ret < 0) {
730 err("failed to initialise WM8510\n"); 711 pr_err("failed to initialise WM8510\n");
731 goto err; 712 goto err;
732 } 713 }
733 return ret; 714 return ret;
@@ -777,7 +758,7 @@ static int wm8510_probe(struct platform_device *pdev)
777 struct snd_soc_codec *codec; 758 struct snd_soc_codec *codec;
778 int ret = 0; 759 int ret = 0;
779 760
780 info("WM8510 Audio Codec %s", WM8510_VERSION); 761 pr_info("WM8510 Audio Codec %s", WM8510_VERSION);
781 762
782 setup = socdev->codec_data; 763 setup = socdev->codec_data;
783 codec = kzalloc(sizeof(struct snd_soc_codec), GFP_KERNEL); 764 codec = kzalloc(sizeof(struct snd_soc_codec), GFP_KERNEL);