diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2008-06-23 09:51:29 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@perex.cz> | 2008-06-26 03:02:05 -0400 |
commit | a5c95e90c1baa9c1114875264bbd283526eb8377 (patch) | |
tree | 6de6ac17bd6e66548867db6f901605ca7192c65d /sound/soc/codecs/wm8750.c | |
parent | 796d2ca84859d1fdb11ff06cd9707ffab5642fca (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/wm8750.c')
-rw-r--r-- | sound/soc/codecs/wm8750.c | 25 |
1 files changed, 3 insertions, 22 deletions
diff --git a/sound/soc/codecs/wm8750.c b/sound/soc/codecs/wm8750.c index 1ae670a98c5c..eb460c9aa63e 100644 --- a/sound/soc/codecs/wm8750.c +++ b/sound/soc/codecs/wm8750.c | |||
@@ -31,25 +31,6 @@ | |||
31 | #define AUDIO_NAME "WM8750" | 31 | #define AUDIO_NAME "WM8750" |
32 | #define WM8750_VERSION "0.12" | 32 | #define WM8750_VERSION "0.12" |
33 | 33 | ||
34 | /* | ||
35 | * Debug | ||
36 | */ | ||
37 | |||
38 | #define WM8750_DEBUG 0 | ||
39 | |||
40 | #ifdef WM8750_DEBUG | ||
41 | #define dbg(format, arg...) \ | ||
42 | printk(KERN_DEBUG AUDIO_NAME ": " format "\n" , ## arg) | ||
43 | #else | ||
44 | #define dbg(format, arg...) do {} while (0) | ||
45 | #endif | ||
46 | #define err(format, arg...) \ | ||
47 | printk(KERN_ERR AUDIO_NAME ": " format "\n" , ## arg) | ||
48 | #define info(format, arg...) \ | ||
49 | printk(KERN_INFO AUDIO_NAME ": " format "\n" , ## arg) | ||
50 | #define warn(format, arg...) \ | ||
51 | printk(KERN_WARNING AUDIO_NAME ": " format "\n" , ## arg) | ||
52 | |||
53 | /* codec private data */ | 34 | /* codec private data */ |
54 | struct wm8750_priv { | 35 | struct wm8750_priv { |
55 | unsigned int sysclk; | 36 | unsigned int sysclk; |
@@ -896,13 +877,13 @@ static int wm8750_codec_probe(struct i2c_adapter *adap, int addr, int kind) | |||
896 | 877 | ||
897 | ret = i2c_attach_client(i2c); | 878 | ret = i2c_attach_client(i2c); |
898 | if (ret < 0) { | 879 | if (ret < 0) { |
899 | err("failed to attach codec at addr %x\n", addr); | 880 | pr_err("failed to attach codec at addr %x\n", addr); |
900 | goto err; | 881 | goto err; |
901 | } | 882 | } |
902 | 883 | ||
903 | ret = wm8750_init(socdev); | 884 | ret = wm8750_init(socdev); |
904 | if (ret < 0) { | 885 | if (ret < 0) { |
905 | err("failed to initialise WM8750\n"); | 886 | pr_err("failed to initialise WM8750\n"); |
906 | goto err; | 887 | goto err; |
907 | } | 888 | } |
908 | return ret; | 889 | return ret; |
@@ -953,7 +934,7 @@ static int wm8750_probe(struct platform_device *pdev) | |||
953 | struct wm8750_priv *wm8750; | 934 | struct wm8750_priv *wm8750; |
954 | int ret = 0; | 935 | int ret = 0; |
955 | 936 | ||
956 | info("WM8750 Audio Codec %s", WM8750_VERSION); | 937 | pr_info("WM8750 Audio Codec %s", WM8750_VERSION); |
957 | codec = kzalloc(sizeof(struct snd_soc_codec), GFP_KERNEL); | 938 | codec = kzalloc(sizeof(struct snd_soc_codec), GFP_KERNEL); |
958 | if (codec == NULL) | 939 | if (codec == NULL) |
959 | return -ENOMEM; | 940 | return -ENOMEM; |