UPSTREAM: usb: dwc3: drop ev_buffs array

we will be using a single event buffer and that
renders ev_buffs array unnecessary. Let's remove it
in favor of a single pointer to a single event
buffer.

Change-Id: I3c7b2e306be660baaa570cf63abaa532f4b87eee
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
Signed-off-by: Wu Liang feng <wulf@rock-chips.com>
(cherry picked from commit 696c8b1282205caa5206264449f80ef756f14ef7)

diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
index 58b3cec8dc51c45a7728b6ecd13f15821b080cf5..7c4b3fced20072853dfc2b115276e82eb1ff4fc9 100644 (file)
--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@ -204,7 +204,7 @@ static void dwc3_free_event_buffers(struct dwc3 *dwc)
 {
        struct dwc3_event_buffer        *evt;
 
-       evt = dwc->ev_buffs[0];
+       evt = dwc->ev_buf;
        if (evt)
                dwc3_free_one_event_buffer(dwc, evt);
 }
@@ -221,17 +221,12 @@ static int dwc3_alloc_event_buffers(struct dwc3 *dwc, unsigned length)
 {
        struct dwc3_event_buffer *evt;
 
-       dwc->ev_buffs = devm_kzalloc(dwc->dev, sizeof(*dwc->ev_buffs),
-                       GFP_KERNEL);
-       if (!dwc->ev_buffs)
-               return -ENOMEM;
-
        evt = dwc3_alloc_one_event_buffer(dwc, length);
        if (IS_ERR(evt)) {
                dev_err(dwc->dev, "can't allocate event buffer\n");
                return PTR_ERR(evt);
        }
-       dwc->ev_buffs[0] = evt;
+       dwc->ev_buf = evt;
 
        return 0;
 }
@@ -246,7 +241,7 @@ static int dwc3_event_buffers_setup(struct dwc3 *dwc)
 {
        struct dwc3_event_buffer        *evt;
 
-       evt = dwc->ev_buffs[0];
+       evt = dwc->ev_buf;
        dwc3_trace(trace_dwc3_core,
                        "Event buf %p dma %08llx length %d\n",
                        evt->buf, (unsigned long long) evt->dma,
@@ -269,7 +264,7 @@ static void dwc3_event_buffers_cleanup(struct dwc3 *dwc)
 {
        struct dwc3_event_buffer        *evt;
 
-       evt = dwc->ev_buffs[0];
+       evt = dwc->ev_buf;
 
        evt->lpos = 0;
 

diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h
index c6c407d4fdaec5142bbece4903b16dfde8e5ffec..aeb84c2bce64868164aa9e84d4b287967a249b5b 100644 (file)
--- a/drivers/usb/dwc3/core.h
+++ b/drivers/usb/dwc3/core.h
@@ -751,7 +751,7 @@ struct dwc3 {
        struct platform_device  *xhci;
        struct resource         xhci_resources[DWC3_XHCI_RESOURCES_NUM];
 
-       struct dwc3_event_buffer **ev_buffs;
+       struct dwc3_event_buffer *ev_buf;
        struct dwc3_ep          *eps[DWC3_ENDPOINTS_NUM];
 
        struct usb_gadget       gadget;

diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
index 5828bac8e1e4232f8a3c23e7026bb3dbeee2cb18..1ad3ec336232d03245d2e8325ab81645b837a2b4 100644 (file)
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@ -2606,7 +2606,7 @@ static irqreturn_t dwc3_process_event_buf(struct dwc3 *dwc)
        int left;
        u32 reg;
 
-       evt = dwc->ev_buffs[0];
+       evt = dwc->ev_buf;
        left = evt->count;
 
        if (!(evt->flags & DWC3_EVENT_PENDING))
@@ -2665,7 +2665,7 @@ static irqreturn_t dwc3_check_event_buf(struct dwc3 *dwc)
        u32 count;
        u32 reg;
 
-       evt = dwc->ev_buffs[0];
+       evt = dwc->ev_buf;
 
        count = dwc3_readl(dwc->regs, DWC3_GEVNTCOUNT(0));
        count &= DWC3_GEVNTCOUNT_MASK;