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 / ohci-ep93xx.c

diff --git a/drivers/usb/host/ohci-ep93xx.c b/drivers/usb/host/ohci-ep93xx.c
index 3d63574d2c7eafa0040810ef46859729d3dbaf72..dbfbd1dfd2e2f798aae4fc60456d2190e47d0428 100644 (file)
--- a/drivers/usb/host/ohci-ep93xx.c
+++ b/drivers/usb/host/ohci-ep93xx.c
@@ -47,7 +47,7 @@ static int usb_hcd_ep93xx_probe(const struct hc_driver *driver,
        struct usb_hcd *hcd;
 
        if (pdev->resource[1].flags != IORESOURCE_IRQ) {
-               dbg("resource[1] is not IORESOURCE_IRQ");
+               dev_dbg(&pdev->dev, "resource[1] is not IORESOURCE_IRQ\n");
                return -ENOMEM;
        }
 
@@ -65,14 +65,14 @@ static int usb_hcd_ep93xx_probe(const struct hc_driver *driver,
 
        hcd->regs = ioremap(hcd->rsrc_start, hcd->rsrc_len);
        if (hcd->regs == NULL) {
-               dbg("ioremap failed");
+               dev_dbg(&pdev->dev, "ioremap failed\n");
                retval = -ENOMEM;
                goto err2;
        }
 
        usb_host_clock = clk_get(&pdev->dev, NULL);
        if (IS_ERR(usb_host_clock)) {
-               dbg("clk_get failed");
+               dev_dbg(&pdev->dev, "clk_get failed\n");
                retval = PTR_ERR(usb_host_clock);
                goto err3;
        }
@@ -116,7 +116,8 @@ static int __devinit ohci_ep93xx_start(struct usb_hcd *hcd)
                return ret;
 
        if ((ret = ohci_run(ohci)) < 0) {
-               err("can't start %s", hcd->self.bus_name);
+               dev_err(hcd->self.controller, "can't start %s\n",
+                       hcd->self.bus_name);
                ohci_stop(hcd);
                return ret;
        }