1 files changed, 12 insertions, 7 deletions

diff --git a/drivers/usb/misc/uss720.c b/drivers/usb/misc/uss720.c
index f1255b0a182d..9a6c27a01793 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;
         }
 
@@ -800,10 +801,14 @@ static int __init uss720_init(void)
         if (retval)
                 goto out;
 
-        info(DRIVER_VERSION ":" DRIVER_DESC);
-        info("NOTE: this is a special purpose driver to allow nonstandard");
-        info("protocols (eg. bitbang) over USS720 usb to parallel cables");
-        info("If you just want to connect to a printer, use usblp instead");
+        printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
+               DRIVER_DESC "\n");
+        printk(KERN_INFO KBUILD_MODNAME ": NOTE: this is a special purpose "
+               "driver to allow nonstandard\n");
+        printk(KERN_INFO KBUILD_MODNAME ": protocols (eg. bitbang) over "
+               "USS720 usb to parallel cables\n");
+        printk(KERN_INFO KBUILD_MODNAME ": If you just want to connect to a "
+               "printer, use usblp instead\n");
 out:
         return retval;
 }