Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[pandora-kernel.git] / drivers / usb / musb / musb_gadget_ep0.c

diff --git a/drivers/usb/musb/musb_gadget_ep0.c b/drivers/usb/musb/musb_gadget_ep0.c
index 75a542e..b2faff2 100644 (file)
--- a/drivers/usb/musb/musb_gadget_ep0.c
+++ b/drivers/usb/musb/musb_gadget_ep0.c
@@ -209,7 +209,7 @@ static inline void musb_try_b_hnp_enable(struct musb *musb)
        void __iomem    *mbase = musb->mregs;
        u8              devctl;
 
-       DBG(1, "HNP: Setting HR\n");
+       dev_dbg(musb->controller, "HNP: Setting HR\n");
        devctl = musb_readb(mbase, MUSB_DEVCTL);
        musb_writeb(mbase, MUSB_DEVCTL, devctl | MUSB_DEVCTL_HR);
 }
@@ -306,7 +306,7 @@ __acquires(musb->lock)
                                /* Maybe start the first request in the queue */
                                request = next_request(musb_ep);
                                if (!musb_ep->busy && request) {
-                                       DBG(3, "restarting the request\n");
+                                       dev_dbg(musb->controller, "restarting the request\n");
                                        musb_ep_restart(musb, request);
                                }
 
@@ -553,7 +553,7 @@ static void ep0_txstate(struct musb *musb)
 
        if (!req) {
                /* WARN_ON(1); */
-               DBG(2, "odd; csr0 %04x\n", musb_readw(regs, MUSB_CSR0));
+               dev_dbg(musb->controller, "odd; csr0 %04x\n", musb_readw(regs, MUSB_CSR0));
                return;
        }
 
@@ -610,7 +610,7 @@ musb_read_setup(struct musb *musb, struct usb_ctrlrequest *req)
        /* NOTE:  earlier 2.6 versions changed setup packets to host
         * order, but now USB packets always stay in USB byte order.
         */
-       DBG(3, "SETUP req%02x.%02x v%04x i%04x l%d\n",
+       dev_dbg(musb->controller, "SETUP req%02x.%02x v%04x i%04x l%d\n",
                req->bRequestType,
                req->bRequest,
                le16_to_cpu(req->wValue),
@@ -678,7 +678,7 @@ irqreturn_t musb_g_ep0_irq(struct musb *musb)
        csr = musb_readw(regs, MUSB_CSR0);
        len = musb_readb(regs, MUSB_COUNT0);
 
-       DBG(4, "csr %04x, count %d, myaddr %d, ep0stage %s\n",
+       dev_dbg(musb->controller, "csr %04x, count %d, myaddr %d, ep0stage %s\n",
                        csr, len,
                        musb_readb(mbase, MUSB_FADDR),
                        decode_ep0stage(musb->ep0_state));
@@ -749,7 +749,7 @@ irqreturn_t musb_g_ep0_irq(struct musb *musb)
 
                /* enter test mode if needed (exit by reset) */
                else if (musb->test_mode) {
-                       DBG(1, "entering TESTMODE\n");
+                       dev_dbg(musb->controller, "entering TESTMODE\n");
 
                        if (MUSB_TEST_PACKET == musb->test_mode_nr)
                                musb_load_testpacket(musb);
@@ -861,7 +861,7 @@ setup:
                                break;
                        }
 
-                       DBG(3, "handled %d, csr %04x, ep0stage %s\n",
+                       dev_dbg(musb->controller, "handled %d, csr %04x, ep0stage %s\n",
                                handled, csr,
                                decode_ep0stage(musb->ep0_state));
 
@@ -878,7 +878,7 @@ setup:
                        if (handled < 0) {
                                musb_ep_select(mbase, 0);
 stall:
-                               DBG(3, "stall (%d)\n", handled);
+                               dev_dbg(musb->controller, "stall (%d)\n", handled);
                                musb->ackpend |= MUSB_CSR0_P_SENDSTALL;
                                musb->ep0_state = MUSB_EP0_STAGE_IDLE;
 finish:
@@ -958,7 +958,7 @@ musb_g_ep0_queue(struct usb_ep *e, struct usb_request *r, gfp_t gfp_flags)
                status = 0;
                break;
        default:
-               DBG(1, "ep0 request queued in state %d\n",
+               dev_dbg(musb->controller, "ep0 request queued in state %d\n",
                                musb->ep0_state);
                status = -EINVAL;
                goto cleanup;
@@ -967,7 +967,7 @@ musb_g_ep0_queue(struct usb_ep *e, struct usb_request *r, gfp_t gfp_flags)
        /* add request to the list */
        list_add_tail(&req->list, &ep->req_list);
 
-       DBG(3, "queue to %s (%s), length=%d\n",
+       dev_dbg(musb->controller, "queue to %s (%s), length=%d\n",
                        ep->name, ep->is_in ? "IN/TX" : "OUT/RX",
                        req->request.length);
 
@@ -1060,7 +1060,7 @@ static int musb_g_ep0_halt(struct usb_ep *e, int value)
                musb->ackpend = 0;
                break;
        default:
-               DBG(1, "ep0 can't halt in state %d\n", musb->ep0_state);
+               dev_dbg(musb->controller, "ep0 can't halt in state %d\n", musb->ep0_state);
                status = -EINVAL;
        }