3 files changed, 8 insertions, 4 deletions

diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c
index 528befdcc78..7f621149f9f 100644
--- a/drivers/usb/core/devio.c
+++ b/drivers/usb/core/devio.c
@@ -413,7 +413,8 @@ static void driver_disconnect(struct usb_interface *intf)
         if (likely(ifnum < 8*sizeof(ps->ifclaimed)))
                 clear_bit(ifnum, &ps->ifclaimed);
         else
-                warn("interface number %u out of range", ifnum);
+                dev_warn(&intf->dev, "interface number %u out of range\n",
+                         ifnum);
 
         usb_set_intfdata(intf, NULL);
 
diff --git a/drivers/usb/core/inode.c b/drivers/usb/core/inode.c
index 77fa7a08080..2cf2dc8528d 100644
--- a/drivers/usb/core/inode.c
+++ b/drivers/usb/core/inode.c
@@ -240,7 +240,9 @@ static void update_sb(struct super_block *sb)
                                 update_special(bus);
                                 break;
                         default:
-                                warn("Unknown node %s mode %x found on remount!\n",bus->d_name.name,bus->d_inode->i_mode);
+                                printk(KERN_WARNING "usbfs: Unknown node %s "
+                                       "mode %x found on remount!\n",
+                                       bus->d_name.name, bus->d_inode->i_mode);
                                 break;
                         }
                 }
@@ -259,7 +261,7 @@ static int remount(struct super_block *sb, int *flags, char *data)
                 return 0;
 
         if (parse_options(sb, data)) {
-                warn("usbfs: mount parameter error:");
+                printk(KERN_WARNING "usbfs: mount parameter error.\n");
                 return -EINVAL;
         }
 
diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
index 286b4431a09..887738577b2 100644
--- a/drivers/usb/core/message.c
+++ b/drivers/usb/core/message.c
@@ -1204,7 +1204,8 @@ int usb_set_interface(struct usb_device *dev, int interface, int alternate)
 
         alt = usb_altnum_to_altsetting(iface, alternate);
         if (!alt) {
-                warn("selecting invalid altsetting %d", alternate);
+                dev_warn(&dev->dev, "selecting invalid altsetting %d",
+                         alternate);
                 return -EINVAL;
         }