[PATCH 05/11] arch/um: Convert #ifdef DEBUG printk(KERN_DEBUG to pr_debug(

Joe Perches
2009-05-15T18:01:42Z

arch/um/drivers/hostaudio_kern.c | 38 +++++++++++---------------------------
1 files changed, 11 insertions(+), 27 deletions(-)

diff --git a/arch/um/drivers/hostaudio_kern.c b/arch/um/drivers/hostaudio_kern.c
index 368219c..2f5b343 100644
--- a/arch/um/drivers/hostaudio_kern.c
+++ b/arch/um/drivers/hostaudio_kern.c
@@ -75,9 +75,7 @@ static ssize_t hostaudio_read(struct file *file, char __user *buffer,
void *kbuf;
int err;

-#ifdef DEBUG
- printk(KERN_DEBUG "hostaudio: read called, count = %d\n", count);
-#endif
+ pr_debug("hostaudio: read called, count = %d\n", count);

kbuf = kmalloc(count, GFP_KERNEL);
if (kbuf == NULL)
@@ -102,9 +100,7 @@ static ssize_t hostaudio_write(struct file *file, const char __user *buffer,
void *kbuf;
int err;

-#ifdef DEBUG
- printk(KERN_DEBUG "hostaudio: write called, count = %d\n", count);
-#endif
+ pr_debug("hostaudio: write called, count = %d\n", count);

kbuf = kmalloc(count, GFP_KERNEL);
if (kbuf == NULL)
@@ -129,9 +125,7 @@ static unsigned int hostaudio_poll(struct file *file,
{
unsigned int mask = 0;

-#ifdef DEBUG
- printk(KERN_DEBUG "hostaudio: poll called (unimplemented)\n");
-#endif
+ pr_debug("hostaudio: poll called (unimplemented)\n");

return mask;
}
@@ -143,9 +137,8 @@ static int hostaudio_ioctl(struct inode *inode, struct file *file,
unsigned long data = 0;
int err;

-#ifdef DEBUG
- printk(KERN_DEBUG "hostaudio: ioctl called, cmd = %u\n", cmd);
-#endif
+ pr_debug("hostaudio: ioctl called, cmd = %u\n", cmd);
+
switch(cmd){
case SNDCTL_DSP_SPEED:
case SNDCTL_DSP_STEREO:
@@ -185,9 +178,7 @@ static int hostaudio_open(struct inode *inode, struct file *file)
int r = 0, w = 0;
int ret;

-#ifdef DEBUG
- printk(KERN_DEBUG "hostaudio: open called (host: %s)\n", dsp);
-#endif
+ pr_debug("hostaudio: open called (host: %s)\n", dsp);

state = kmalloc(sizeof(struct hostaudio_state), GFP_KERNEL);
if (state == NULL)
@@ -212,9 +203,8 @@ static int hostaudio_release(struct inode *inode, struct file *file)
{
struct hostaudio_state *state = file->private_data;

-#ifdef DEBUG
- printk(KERN_DEBUG "hostaudio: release called\n");
-#endif
+ pr_debug("hostaudio: release called\n");
+
os_close_file(state->fd);
kfree(state);

@@ -228,9 +218,7 @@ static int hostmixer_ioctl_mixdev(struct inode *inode, struct file *file,
{
struct hostmixer_state *state = file->private_data;

-#ifdef DEBUG
- printk(KERN_DEBUG "hostmixer: ioctl called\n");
-#endif
+ pr_debug("hostmixer: ioctl called\n");

return os_ioctl_generic(state->fd, cmd, arg);
}
@@ -241,9 +229,7 @@ static int hostmixer_open_mixdev(struct inode *inode, struct file *file)
int r = 0, w = 0;
int ret;

-#ifdef DEBUG
- printk(KERN_DEBUG "hostmixer: open called (host: %s)\n", mixer);
-#endif
+ pr_debug("hostmixer: open called (host: %s)\n", mixer);

state = kmalloc(sizeof(struct hostmixer_state), GFP_KERNEL);
if (state == NULL)
@@ -271,9 +257,7 @@ static int hostmixer_release(struct inode *inode, struct file *file)
{
struct hostmixer_state *state = file->private_data;

-#ifdef DEBUG
- printk(KERN_DEBUG "hostmixer: release called\n");
-#endif
+ pr_debug("hostmixer: release called\n");

os_close_file(state->fd);
kfree(state);
--
1.6.3.1.9.g95405b.dirty