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/wm8990.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/wm8990.c')
-rw-r--r-- | sound/soc/codecs/wm8990.c | 25 |
1 files changed, 3 insertions, 22 deletions
diff --git a/sound/soc/codecs/wm8990.c b/sound/soc/codecs/wm8990.c index a7d25e2f2522..a1371b73ba7d 100644 --- a/sound/soc/codecs/wm8990.c +++ b/sound/soc/codecs/wm8990.c | |||
@@ -33,25 +33,6 @@ | |||
33 | #define AUDIO_NAME "wm8990" | 33 | #define AUDIO_NAME "wm8990" |
34 | #define WM8990_VERSION "0.2" | 34 | #define WM8990_VERSION "0.2" |
35 | 35 | ||
36 | /* | ||
37 | * Debug | ||
38 | */ | ||
39 | |||
40 | #define WM8990_DEBUG 0 | ||
41 | |||
42 | #ifdef WM8990_DEBUG | ||
43 | #define dbg(format, arg...) \ | ||
44 | printk(KERN_DEBUG AUDIO_NAME ": " format "\n" , ## arg) | ||
45 | #else | ||
46 | #define dbg(format, arg...) do {} while (0) | ||
47 | #endif | ||
48 | #define err(format, arg...) \ | ||
49 | printk(KERN_ERR AUDIO_NAME ": " format "\n" , ## arg) | ||
50 | #define info(format, arg...) \ | ||
51 | printk(KERN_INFO AUDIO_NAME ": " format "\n" , ## arg) | ||
52 | #define warn(format, arg...) \ | ||
53 | printk(KERN_WARNING AUDIO_NAME ": " format "\n" , ## arg) | ||
54 | |||
55 | /* codec private data */ | 36 | /* codec private data */ |
56 | struct wm8990_priv { | 37 | struct wm8990_priv { |
57 | unsigned int sysclk; | 38 | unsigned int sysclk; |
@@ -1524,13 +1505,13 @@ static int wm8990_codec_probe(struct i2c_adapter *adap, int addr, int kind) | |||
1524 | 1505 | ||
1525 | ret = i2c_attach_client(i2c); | 1506 | ret = i2c_attach_client(i2c); |
1526 | if (ret < 0) { | 1507 | if (ret < 0) { |
1527 | err("failed to attach codec at addr %x\n", addr); | 1508 | pr_err("failed to attach codec at addr %x\n", addr); |
1528 | goto err; | 1509 | goto err; |
1529 | } | 1510 | } |
1530 | 1511 | ||
1531 | ret = wm8990_init(socdev); | 1512 | ret = wm8990_init(socdev); |
1532 | if (ret < 0) { | 1513 | if (ret < 0) { |
1533 | err("failed to initialise WM8990\n"); | 1514 | pr_err("failed to initialise WM8990\n"); |
1534 | goto err; | 1515 | goto err; |
1535 | } | 1516 | } |
1536 | return ret; | 1517 | return ret; |
@@ -1579,7 +1560,7 @@ static int wm8990_probe(struct platform_device *pdev) | |||
1579 | struct wm8990_priv *wm8990; | 1560 | struct wm8990_priv *wm8990; |
1580 | int ret = 0; | 1561 | int ret = 0; |
1581 | 1562 | ||
1582 | info("WM8990 Audio Codec %s\n", WM8990_VERSION); | 1563 | pr_info("WM8990 Audio Codec %s\n", WM8990_VERSION); |
1583 | 1564 | ||
1584 | setup = socdev->codec_data; | 1565 | setup = socdev->codec_data; |
1585 | codec = kzalloc(sizeof(struct snd_soc_codec), GFP_KERNEL); | 1566 | codec = kzalloc(sizeof(struct snd_soc_codec), GFP_KERNEL); |