Merge tag 'mfd-3.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6

[deliverable/linux.git] / drivers / usb / host / oxu210hp-hcd.c

diff --git a/drivers/usb/host/oxu210hp-hcd.c b/drivers/usb/host/oxu210hp-hcd.c
index 3b38030b02a87a2407f7439b7c0b8fc259fbc880..4f0f0339532f7e2729fe90f6972301ec32116041 100644 (file)
--- a/drivers/usb/host/oxu210hp-hcd.c
+++ b/drivers/usb/host/oxu210hp-hcd.c
@@ -1399,8 +1399,8 @@ static struct ehci_qh *qh_make(struct oxu_hcd *oxu,
                                 * But interval 1 scheduling is simpler, and
                                 * includes high bandwidth.
                                 */
-                               dbg("intr period %d uframes, NYET!",
-                                               urb->interval);
+                               oxu_dbg(oxu, "intr period %d uframes, NYET!\n",
+                                       urb->interval);
                                goto done;
                        }
                } else {
@@ -1471,7 +1471,7 @@ static struct ehci_qh *qh_make(struct oxu_hcd *oxu,
                }
                break;
        default:
-               dbg("bogus dev %p speed %d", urb->dev, urb->dev->speed);
+               oxu_dbg(oxu, "bogus dev %p speed %d\n", urb->dev, urb->dev->speed);
 done:
                qh_put(qh);
                return NULL;
@@ -2307,7 +2307,7 @@ restart:
                                qh_put(temp.qh);
                                break;
                        default:
-                               dbg("corrupt type %d frame %d shadow %p",
+                               oxu_dbg(oxu, "corrupt type %d frame %d shadow %p\n",
                                        type, frame, q.ptr);
                                q.ptr = NULL;
                        }
@@ -2991,8 +2991,9 @@ static int oxu_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
                                /* shouldn't happen often, but ...
                                 * FIXME kill those tds' urbs
                                 */
-                               err("can't reschedule qh %p, err %d",
-                                       qh, status);
+                               dev_err(hcd->self.controller,
+                                       "can't reschedule qh %p, err %d\n", qh,
+                                       status);
                        }
                        return status;
                }