usb: dwc3: Fix not calling dev_xxx with a device

This logs with the device from struct dwc3. Some files also need to include
dm.h so fields in udevice can be accessed.

Signed-off-by: Sean Anderson <seanga2@gmail.com>
Tested-by: Patrick Delaunay <patrick.delaunay@st.com>

diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
index 86825565895f50b7691fe4bf40c758d69fffe98a..2e003530a15eb2ccfb182e11289ebb592f1c049e 100644 (file)
--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@ -592,7 +592,7 @@ static int dwc3_core_init_mode(struct dwc3 *dwc)
                dwc3_set_mode(dwc, DWC3_GCTL_PRTCAP_DEVICE);
                ret = dwc3_gadget_init(dwc);
                if (ret) {
-                       dev_err(dev, "failed to initialize gadget\n");
+                       dev_err(dwc->dev, "failed to initialize gadget\n");
                        return ret;
                }
                break;
@@ -600,7 +600,7 @@ static int dwc3_core_init_mode(struct dwc3 *dwc)
                dwc3_set_mode(dwc, DWC3_GCTL_PRTCAP_HOST);
                ret = dwc3_host_init(dwc);
                if (ret) {
-                       dev_err(dev, "failed to initialize host\n");
+                       dev_err(dwc->dev, "failed to initialize host\n");
                        return ret;
                }
                break;
@@ -608,18 +608,19 @@ static int dwc3_core_init_mode(struct dwc3 *dwc)
                dwc3_set_mode(dwc, DWC3_GCTL_PRTCAP_OTG);
                ret = dwc3_host_init(dwc);
                if (ret) {
-                       dev_err(dev, "failed to initialize host\n");
+                       dev_err(dwc->dev, "failed to initialize host\n");
                        return ret;
                }
 
                ret = dwc3_gadget_init(dwc);
                if (ret) {
-                       dev_err(dev, "failed to initialize gadget\n");
+                       dev_err(dwc->dev, "failed to initialize gadget\n");
                        return ret;
                }
                break;
        default:
-               dev_err(dev, "Unsupported mode of operation %d\n", dwc->dr_mode);
+               dev_err(dwc->dev,
+                       "Unsupported mode of operation %d\n", dwc->dr_mode);
                return -EINVAL;
        }
 
@@ -768,7 +769,7 @@ int dwc3_uboot_init(struct dwc3_device *dwc3_dev)
 
        ret = dwc3_core_init(dwc);
        if (ret) {
-               dev_err(dev, "failed to initialize core\n");
+               dev_err(dwc->dev, "failed to initialize core\n");
                goto err0;
        }
 
@@ -974,7 +975,7 @@ int dwc3_init(struct dwc3 *dwc)
 
        ret = dwc3_core_init(dwc);
        if (ret) {
-               dev_err(dev, "failed to initialize core\n");
+               dev_err(dwc->dev, "failed to initialize core\n");
                goto core_fail;
        }
 

diff --git a/drivers/usb/dwc3/ep0.c b/drivers/usb/dwc3/ep0.c
index 385bed3e34c48e180572c1a4e7a479abd0f064a0..75ac993bc6450c341bab0eecdf611b4eada3845d 100644 (file)
--- a/drivers/usb/dwc3/ep0.c
+++ b/drivers/usb/dwc3/ep0.c
@@ -14,6 +14,7 @@
  */
 #include <common.h>
 #include <cpu_func.h>
+#include <dm.h>
 #include <dm/device_compat.h>
 #include <linux/bug.h>
 #include <linux/kernel.h>

diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
index 2aec874e1ded23de5eedd23f5c756acbd35fe227..4e68fb0a82f0d66525873b82e6e5906e73412c73 100644 (file)
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@ -17,6 +17,7 @@
 #include <cpu_func.h>
 #include <log.h>
 #include <malloc.h>
+#include <dm.h>
 #include <dm/device_compat.h>
 #include <dm/devres.h>
 #include <linux/bug.h>
@@ -633,7 +634,7 @@ static int dwc3_gadget_ep_enable(struct usb_ep *ep,
                strlcat(dep->name, "-int", sizeof(dep->name));
                break;
        default:
-               dev_err(dwc->dev, "invalid endpoint transfer type\n");
+               dev_err(dep->dwc->dev, "invalid endpoint transfer type\n");
        }
 
        spin_lock_irqsave(&dwc->lock, flags);
@@ -708,10 +709,9 @@ static void dwc3_prepare_one_trb(struct dwc3_ep *dep,
 {
        struct dwc3_trb         *trb;
 
-       dev_vdbg(dwc->dev, "%s: req %p dma %08llx length %d%s%s\n",
-                       dep->name, req, (unsigned long long) dma,
-                       length, last ? " last" : "",
-                       chain ? " chain" : "");
+       dev_vdbg(dep->dwc->dev, "%s: req %p dma %08llx length %d%s%s\n",
+                dep->name, req, (unsigned long long)dma,
+                length, last ? " last" : "", chain ? " chain" : "");
 
 
        trb = &dep->trb_pool[dep->free_slot & DWC3_TRB_MASK];
@@ -1074,21 +1074,22 @@ static int dwc3_gadget_ep_queue(struct usb_ep *ep, struct usb_request *request,
 
        spin_lock_irqsave(&dwc->lock, flags);
        if (!dep->endpoint.desc) {
-               dev_dbg(dwc->dev, "trying to queue request %p to disabled %s\n",
-                               request, ep->name);
+               dev_dbg(dep->dwc->dev,
+                       "trying to queue request %p to disabled %s\n", request,
+                       ep->name);
                ret = -ESHUTDOWN;
                goto out;
        }
 
        if (req->dep != dep) {
-               WARN(true, "request %p belongs to '%s'\n",
-                               request, req->dep->name);
+               WARN(true, "request %p belongs to '%s'\n", request,
+                    req->dep->name);
                ret = -EINVAL;
                goto out;
        }
 
-       dev_vdbg(dwc->dev, "queing request %p to %s length %d\n",
-                       request, ep->name, request->length);
+       dev_vdbg(dep->dwc->dev, "queing request %p to %s length %d\n",
+                request, ep->name, request->length);
 
        ret = __dwc3_gadget_ep_queue(dep, req);