Commit 79251552 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

[PATCH] USB: more dev_printk() cleanups.

parent d009dec1
......@@ -177,7 +177,7 @@ void usb_show_string(struct usb_device *dev, char *id, int index)
if (!(buf = kmalloc(256, GFP_KERNEL)))
return;
if (usb_string(dev, index, buf, 256) > 0)
printk(KERN_INFO "%s: %s\n", id, buf);
dev_printk(KERN_INFO, dev->dev, "%s: %s\n", id, buf);
kfree(buf);
}
......
......@@ -931,7 +931,7 @@ static void set_device_description (struct usb_device *dev)
if (prod && usb_string (dev, prod, prod_str, 256) > 0) {
#ifdef DEBUG
printk (KERN_INFO "Product: %s\n", prod_str);
dev_printk (KERN_INFO, dev->dev, "Product: %s\n", prod_str);
#endif
} else {
prod_str = 0;
......@@ -939,7 +939,7 @@ static void set_device_description (struct usb_device *dev)
if (mfgr && usb_string (dev, mfgr, mfgr_str, 256) > 0) {
#ifdef DEBUG
printk (KERN_INFO "Manufacturer: %s\n", mfgr_str);
dev_printk (KERN_INFO, dev->dev, "Manufacturer: %s\n", mfgr_str);
#endif
} else {
mfgr_str = 0;
......@@ -1108,7 +1108,7 @@ int usb_new_device(struct usb_device *dev, struct device *parent)
/* USB device state == configured ... tell the world! */
dbg("new device strings: Mfr=%d, Product=%d, SerialNumber=%d",
dev_dbg(dev->dev, "new device strings: Mfr=%d, Product=%d, SerialNumber=%d\n",
dev->descriptor.iManufacturer, dev->descriptor.iProduct, dev->descriptor.iSerialNumber);
set_device_description (dev);
......
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