USB: remove warn() macro from usb drivers

USB should not be having it's own printk macros, so remove warn() and
use the system-wide standard of dev_warn() wherever possible.  In the
few places that will not work out, use a basic printk().

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

2 files changed, 5 insertions, 4 deletions

diff --git a/drivers/usb/misc/usblcd.c b/drivers/usb/misc/usblcd.c
index 2db4228fbb01..d589324bb0d0 100644
--- a/drivers/usb/misc/usblcd.c
+++ b/drivers/usb/misc/usblcd.c
@@ -311,7 +311,7 @@ static int lcd_probe(struct usb_interface *interface, const struct usb_device_id
         dev->interface = interface;
 
         if (le16_to_cpu(dev->udev->descriptor.idProduct) != 0x0001) {
-                warn(KERN_INFO "USBLCD model not supported.");
+                dev_warn(&interface->dev, "USBLCD model not supported.\n");
                 return -ENODEV;
         }
         
diff --git a/drivers/usb/misc/uss720.c b/drivers/usb/misc/uss720.c
index f1255b0a182d..594f3e4e8c2e 100644
--- a/drivers/usb/misc/uss720.c
+++ b/drivers/usb/misc/uss720.c
@@ -228,11 +228,12 @@ static int get_1284_register(struct parport *pp, unsigned char reg, unsigned cha
                 ret = rq->urb->status;
                 *val = priv->reg[(reg >= 9) ? 0 : regindex[reg]];
                 if (ret)
-                        warn("get_1284_register: usb error %d", ret);
+                        printk(KERN_WARNING "get_1284_register: "
+                               "usb error %d\n", ret);
                 kref_put(&rq->ref_count, destroy_async);
                 return ret;
         }
-        warn("get_1284_register timeout");
+        printk(KERN_WARNING "get_1284_register timeout\n");
         kill_all_async_requests_priv(priv);
         return -EIO;
 }
@@ -716,7 +717,7 @@ static int uss720_probe(struct usb_interface *intf,
         spin_lock_init(&priv->asynclock);
         INIT_LIST_HEAD(&priv->asynclist);
         if (!(pp = parport_register_port(0, PARPORT_IRQ_NONE, PARPORT_DMA_NONE, &parport_uss720_ops))) {
-                warn("could not register parport");
+                printk(KERN_WARNING "uss720: could not register parport\n");
                 goto probe_abort;
         }