USB: remove warn() macro from usb drivers

[linux-2.6-omap-h63xx.git] / drivers / usb / misc / uss720.c

diff --git a/drivers/usb/misc/uss720.c b/drivers/usb/misc/uss720.c
index 70250252ae2ae404d30f5583d4396a6e70f590fa..594f3e4e8c2e628fd1dfcbaf846c5f27fcb986d2 100644 (file)
--- a/drivers/usb/misc/uss720.c
+++ b/drivers/usb/misc/uss720.c
@@ -111,12 +111,13 @@ static void async_complete(struct urb *urb)
        struct uss720_async_request *rq;
        struct parport *pp;
        struct parport_uss720_private *priv;
+       int status = urb->status;
 
        rq = urb->context;
        priv = rq->priv;
        pp = priv->pp;
-       if (urb->status) {
-               err("async_complete: urb error %d", urb->status);
+       if (status) {
+               err("async_complete: urb error %d", status);
        } else if (rq->dr.bRequest == 3) {
                memcpy(priv->reg, rq->reg, sizeof(priv->reg));
 #if 0
@@ -127,7 +128,7 @@ static void async_complete(struct urb *urb)
 #endif
                /* if nAck interrupts are enabled and we have an interrupt, call the interrupt procedure */
                if (rq->reg[2] & rq->reg[1] & 0x10 && pp)
-                       parport_generic_irq(0, pp);
+                       parport_generic_irq(pp);
        }
        complete(&rq->compl);
        kref_put(&rq->ref_count, destroy_async);
@@ -227,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;
 }
@@ -336,7 +338,7 @@ static int uss720_irq(int usbstatus, void *buffer, int len, void *dev_id)
        memcpy(priv->reg, buffer, 4);
        /* if nAck interrupts are enabled and we have an interrupt, call the interrupt procedure */
        if (priv->reg[2] & priv->reg[1] & 0x10)
-               parport_generic_irq(0, pp, NULL);
+               parport_generic_irq(pp);
        return 1;
 }
 #endif
@@ -715,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;
        }