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/wm8753.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/wm8753.c')
-rw-r--r-- | sound/soc/codecs/wm8753.c | 25 |
1 files changed, 3 insertions, 22 deletions
diff --git a/sound/soc/codecs/wm8753.c b/sound/soc/codecs/wm8753.c index 00b481183d45..be01a738f184 100644 --- a/sound/soc/codecs/wm8753.c +++ b/sound/soc/codecs/wm8753.c | |||
@@ -55,25 +55,6 @@ | |||
55 | #define AUDIO_NAME "wm8753" | 55 | #define AUDIO_NAME "wm8753" |
56 | #define WM8753_VERSION "0.16" | 56 | #define WM8753_VERSION "0.16" |
57 | 57 | ||
58 | /* | ||
59 | * Debug | ||
60 | */ | ||
61 | |||
62 | #define WM8753_DEBUG 0 | ||
63 | |||
64 | #ifdef WM8753_DEBUG | ||
65 | #define dbg(format, arg...) \ | ||
66 | printk(KERN_DEBUG AUDIO_NAME ": " format "\n" , ## arg) | ||
67 | #else | ||
68 | #define dbg(format, arg...) do {} while (0) | ||
69 | #endif | ||
70 | #define err(format, arg...) \ | ||
71 | printk(KERN_ERR AUDIO_NAME ": " format "\n" , ## arg) | ||
72 | #define info(format, arg...) \ | ||
73 | printk(KERN_INFO AUDIO_NAME ": " format "\n" , ## arg) | ||
74 | #define warn(format, arg...) \ | ||
75 | printk(KERN_WARNING AUDIO_NAME ": " format "\n" , ## arg) | ||
76 | |||
77 | static int caps_charge = 2000; | 58 | static int caps_charge = 2000; |
78 | module_param(caps_charge, int, 0); | 59 | module_param(caps_charge, int, 0); |
79 | MODULE_PARM_DESC(caps_charge, "WM8753 cap charge time (msecs)"); | 60 | MODULE_PARM_DESC(caps_charge, "WM8753 cap charge time (msecs)"); |
@@ -1689,13 +1670,13 @@ static int wm8753_codec_probe(struct i2c_adapter *adap, int addr, int kind) | |||
1689 | 1670 | ||
1690 | ret = i2c_attach_client(i2c); | 1671 | ret = i2c_attach_client(i2c); |
1691 | if (ret < 0) { | 1672 | if (ret < 0) { |
1692 | err("failed to attach codec at addr %x\n", addr); | 1673 | pr_err("failed to attach codec at addr %x\n", addr); |
1693 | goto err; | 1674 | goto err; |
1694 | } | 1675 | } |
1695 | 1676 | ||
1696 | ret = wm8753_init(socdev); | 1677 | ret = wm8753_init(socdev); |
1697 | if (ret < 0) { | 1678 | if (ret < 0) { |
1698 | err("failed to initialise WM8753\n"); | 1679 | pr_err("failed to initialise WM8753\n"); |
1699 | goto err; | 1680 | goto err; |
1700 | } | 1681 | } |
1701 | 1682 | ||
@@ -1747,7 +1728,7 @@ static int wm8753_probe(struct platform_device *pdev) | |||
1747 | struct wm8753_priv *wm8753; | 1728 | struct wm8753_priv *wm8753; |
1748 | int ret = 0; | 1729 | int ret = 0; |
1749 | 1730 | ||
1750 | info("WM8753 Audio Codec %s", WM8753_VERSION); | 1731 | pr_info("WM8753 Audio Codec %s", WM8753_VERSION); |
1751 | 1732 | ||
1752 | setup = socdev->codec_data; | 1733 | setup = socdev->codec_data; |
1753 | codec = kzalloc(sizeof(struct snd_soc_codec), GFP_KERNEL); | 1734 | codec = kzalloc(sizeof(struct snd_soc_codec), GFP_KERNEL); |