[linux-yocto] [linux-yocto-4.4][PATCH] drivers/usb/dwc3/gadget.c: fix merge

[California Sullivan]

Commit "c813008 usb: dwc3: replace %p with %pK" did not apply correctly
due a previous backport. In the confusion, some error checking was
added back which included a goto whose target didn't exist, causing a
compilation failure.

Fix the issue by reverting the merge and the patch, then manually
applying the intended changes (replacing all instances of %p with %pK in
the affected files).

Signed-off-by: California Sullivan <california.l.sullivan at intel.com>
---
This is for the standard/intel/base branch, which should then be
waterfalled into the other intel branches.

 drivers/usb/dwc3/gadget.c | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
index 192c119..6c369a6 100644
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@ -813,7 +813,7 @@ static void dwc3_prepare_one_trb(struct dwc3_ep *dep,
 {
 	struct dwc3_trb		*trb;
 
-	dwc3_trace(trace_dwc3_gadget, "%s: req %p dma %08llx length %d%s%s",
+	dwc3_trace(trace_dwc3_gadget, "%s: req %pK dma %08llx length %d%s%s",
 			dep->name, req, (unsigned long long) dma,
 			length, last ? " last" : "",
 			chain ? " chain" : "");
@@ -1085,14 +1085,14 @@ static int __dwc3_gadget_ep_queue(struct dwc3_ep *dep, struct dwc3_request *req)
 
 	if (!dep->endpoint.desc) {
 		dwc3_trace(trace_dwc3_gadget,
-				"trying to queue request %p to disabled %s\n",
+				"trying to queue request %pK to disabled %s\n",
 				&req->request, dep->endpoint.name);
 		return -ESHUTDOWN;
 	}
 
-	if (WARN(req->dep != dep, "request %p belongs to '%s'\n",
+	if (WARN(req->dep != dep, "request %pK belongs to '%s'\n",
 				&req->request, req->dep->name)) {
-		dwc3_trace(trace_dwc3_gadget, "request %p belongs to '%s'\n",
+		dwc3_trace(trace_dwc3_gadget, "request %pK belongs to '%s'\n",
 				&req->request, req->dep->name);
 		return -EINVAL;
 	}
@@ -1242,19 +1242,6 @@ static int dwc3_gadget_ep_queue(struct usb_ep *ep, struct usb_request *request,
 	int				ret;
 
 	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);
-		ret = -ESHUTDOWN;
-		goto out;
-	}
-
-	if (WARN(req->dep != dep, "request %pK belongs to '%s'\n",
-				request, req->dep->name)) {
-		ret = -EINVAL;
-		goto out;
-	}
-
 	ret = __dwc3_gadget_ep_queue(dep, req);
 
 	/*
-- 
2.9.5