1 From 696c8b1282205caa5206264449f80ef756f14ef7 Mon Sep 17 00:00:00 2001
2 From: Felipe Balbi <felipe.balbi@linux.intel.com>
3 Date: Wed, 30 Mar 2016 09:37:03 +0300
4 Subject: usb: dwc3: drop ev_buffs array
6 we will be using a single event buffer and that
7 renders ev_buffs array unnecessary. Let's remove it
8 in favor of a single pointer to a single event
11 Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
13 drivers/usb/dwc3/core.c | 13 ++++---------
14 drivers/usb/dwc3/core.h | 2 +-
15 drivers/usb/dwc3/gadget.c | 4 ++--
16 3 files changed, 7 insertions(+), 12 deletions(-)
18 --- a/drivers/usb/dwc3/core.c
19 +++ b/drivers/usb/dwc3/core.c
20 @@ -204,7 +204,7 @@ static void dwc3_free_event_buffers(stru
22 struct dwc3_event_buffer *evt;
24 - evt = dwc->ev_buffs[0];
27 dwc3_free_one_event_buffer(dwc, evt);
29 @@ -221,17 +221,12 @@ static int dwc3_alloc_event_buffers(stru
31 struct dwc3_event_buffer *evt;
33 - dwc->ev_buffs = devm_kzalloc(dwc->dev, sizeof(*dwc->ev_buffs),
38 evt = dwc3_alloc_one_event_buffer(dwc, length);
40 dev_err(dwc->dev, "can't allocate event buffer\n");
43 - dwc->ev_buffs[0] = evt;
48 @@ -246,7 +241,7 @@ static int dwc3_event_buffers_setup(stru
50 struct dwc3_event_buffer *evt;
52 - evt = dwc->ev_buffs[0];
54 dwc3_trace(trace_dwc3_core,
55 "Event buf %p dma %08llx length %d\n",
56 evt->buf, (unsigned long long) evt->dma,
57 @@ -269,7 +264,7 @@ static void dwc3_event_buffers_cleanup(s
59 struct dwc3_event_buffer *evt;
61 - evt = dwc->ev_buffs[0];
66 --- a/drivers/usb/dwc3/core.h
67 +++ b/drivers/usb/dwc3/core.h
68 @@ -750,7 +750,7 @@ struct dwc3 {
69 struct platform_device *xhci;
70 struct resource xhci_resources[DWC3_XHCI_RESOURCES_NUM];
72 - struct dwc3_event_buffer **ev_buffs;
73 + struct dwc3_event_buffer *ev_buf;
74 struct dwc3_ep *eps[DWC3_ENDPOINTS_NUM];
76 struct usb_gadget gadget;
77 --- a/drivers/usb/dwc3/gadget.c
78 +++ b/drivers/usb/dwc3/gadget.c
79 @@ -2563,7 +2563,7 @@ static irqreturn_t dwc3_process_event_bu
83 - evt = dwc->ev_buffs[0];
87 if (!(evt->flags & DWC3_EVENT_PENDING))
88 @@ -2622,7 +2622,7 @@ static irqreturn_t dwc3_check_event_buf(
92 - evt = dwc->ev_buffs[0];
95 count = dwc3_readl(dwc->regs, DWC3_GEVNTCOUNT(0));
96 count &= DWC3_GEVNTCOUNT_MASK;