Commit 1677b6d0 authored by Brad Hards's avatar Brad Hards Committed by Greg Kroah-Hartman

[PATCH] USB: printk janitorial fixes

This is the first of a few janitorial fixes for printk() usage in the USB
tree.
parent 5d91fba7
...@@ -619,7 +619,7 @@ static void *acm_probe(struct usb_device *dev, unsigned int ifnum, ...@@ -619,7 +619,7 @@ static void *acm_probe(struct usb_device *dev, unsigned int ifnum,
buf += readsize, acm->writesize, acm_write_bulk, acm); buf += readsize, acm->writesize, acm_write_bulk, acm);
acm->writeurb->transfer_flags |= USB_NO_FSBR; acm->writeurb->transfer_flags |= USB_NO_FSBR;
printk(KERN_INFO "ttyACM%d: USB ACM device\n", minor); info("ttyACM%d: USB ACM device", minor);
acm_set_control(acm, acm->ctrlout); acm_set_control(acm, acm->ctrlout);
......
...@@ -317,13 +317,13 @@ static int usbfs_fill_super(struct super_block *sb, void *data, int silent) ...@@ -317,13 +317,13 @@ static int usbfs_fill_super(struct super_block *sb, void *data, int silent)
inode = usbfs_get_inode(sb, S_IFDIR | 0755, 0); inode = usbfs_get_inode(sb, S_IFDIR | 0755, 0);
if (!inode) { if (!inode) {
dbg("%s: could not get inode!\n",__FUNCTION__); dbg("%s: could not get inode!",__FUNCTION__);
return -ENOMEM; return -ENOMEM;
} }
root = d_alloc_root(inode); root = d_alloc_root(inode);
if (!root) { if (!root) {
dbg("%s: could not get root dentry!\n",__FUNCTION__); dbg("%s: could not get root dentry!",__FUNCTION__);
iput(inode); iput(inode);
return -ENOMEM; return -ENOMEM;
} }
...@@ -364,7 +364,7 @@ static int fs_create_by_name (const char *name, mode_t mode, ...@@ -364,7 +364,7 @@ static int fs_create_by_name (const char *name, mode_t mode,
} }
if (!parent) { if (!parent) {
dbg("Ah! can not find a parent!\n"); dbg("Ah! can not find a parent!");
return -EFAULT; return -EFAULT;
} }
...@@ -390,7 +390,7 @@ static int fs_create_by_name (const char *name, mode_t mode, ...@@ -390,7 +390,7 @@ static int fs_create_by_name (const char *name, mode_t mode,
error = vfs_mkdir(parent->d_inode,d,mode); error = vfs_mkdir(parent->d_inode,d,mode);
break; break;
default: default:
err("cannot create special files\n"); err("cannot create special files");
} }
*dentry = d; *dentry = d;
} }
...@@ -408,7 +408,7 @@ static struct dentry *fs_create_file (const char *name, mode_t mode, ...@@ -408,7 +408,7 @@ static struct dentry *fs_create_file (const char *name, mode_t mode,
struct dentry *dentry; struct dentry *dentry;
int error; int error;
dbg("creating file '%s'\n",name); dbg("creating file '%s'",name);
error = fs_create_by_name(name,mode,parent,&dentry); error = fs_create_by_name(name,mode,parent,&dentry);
if (error) { if (error) {
...@@ -510,7 +510,7 @@ static int get_mount (void) ...@@ -510,7 +510,7 @@ static int get_mount (void)
mntput(mnt); mntput(mnt);
go_ahead: go_ahead:
dbg("mount_count = %d\n", mount_count); dbg("mount_count = %d", mount_count);
return 0; return 0;
} }
...@@ -526,7 +526,7 @@ static void remove_mount (void) ...@@ -526,7 +526,7 @@ static void remove_mount (void)
spin_unlock (&mount_lock); spin_unlock (&mount_lock);
mntput(mnt); mntput(mnt);
dbg("mount_count = %d\n", mount_count); dbg("mount_count = %d", mount_count);
} }
static int create_special_files (void) static int create_special_files (void)
......
...@@ -62,7 +62,7 @@ static int usb_start_wait_urb(struct urb *urb, int timeout, int* actual_length) ...@@ -62,7 +62,7 @@ static int usb_start_wait_urb(struct urb *urb, int timeout, int* actual_length)
urb->pipe, urb->status, timeout); urb->pipe, urb->status, timeout);
status = urb->status; status = urb->status;
} else { } else {
printk("usb_control/bulk_msg: timeout\n"); warn("usb_control/bulk_msg: timeout");
usb_unlink_urb(urb); // remove urb safely usb_unlink_urb(urb); // remove urb safely
status = -ETIMEDOUT; status = -ETIMEDOUT;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment