target/linux/ipq806x/patches-4.4/096-09-usb-dwc3-drop-ev_buffs-array.patch

   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
   5
   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
   9 buffer.
  10
  11 Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
  12 ---
  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(-)
  17
  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
  21  {
  22         struct dwc3_event_buffer        *evt;
  23
  24 -       evt = dwc->ev_buffs[0];
  25 +       evt = dwc->ev_buf;
  26         if (evt)
  27                 dwc3_free_one_event_buffer(dwc, evt);
  28  }
  29 @@ -221,17 +221,12 @@ static int dwc3_alloc_event_buffers(stru
  30  {
  31         struct dwc3_event_buffer *evt;
  32
  33 -       dwc->ev_buffs = devm_kzalloc(dwc->dev, sizeof(*dwc->ev_buffs),
  34 -                       GFP_KERNEL);
  35 -       if (!dwc->ev_buffs)
  36 -               return -ENOMEM;
  37 -
  38         evt = dwc3_alloc_one_event_buffer(dwc, length);
  39         if (IS_ERR(evt)) {
  40                 dev_err(dwc->dev, "can't allocate event buffer\n");
  41                 return PTR_ERR(evt);
  42         }
  43 -       dwc->ev_buffs[0] = evt;
  44 +       dwc->ev_buf = evt;
  45
  46         return 0;
  47  }
  48 @@ -246,7 +241,7 @@ static int dwc3_event_buffers_setup(stru
  49  {
  50         struct dwc3_event_buffer        *evt;
  51
  52 -       evt = dwc->ev_buffs[0];
  53 +       evt = dwc->ev_buf;
  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
  58  {
  59         struct dwc3_event_buffer        *evt;
  60
  61 -       evt = dwc->ev_buffs[0];
  62 +       evt = dwc->ev_buf;
  63
  64         evt->lpos = 0;
  65
  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];
  71
  72 -       struct dwc3_event_buffer **ev_buffs;
  73 +       struct dwc3_event_buffer *ev_buf;
  74         struct dwc3_ep          *eps[DWC3_ENDPOINTS_NUM];
  75
  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
  80         int left;
  81         u32 reg;
  82
  83 -       evt = dwc->ev_buffs[0];
  84 +       evt = dwc->ev_buf;
  85         left = evt->count;
  86
  87         if (!(evt->flags & DWC3_EVENT_PENDING))
  88 @@ -2622,7 +2622,7 @@ static irqreturn_t dwc3_check_event_buf(
  89         u32 count;
  90         u32 reg;
  91
  92 -       evt = dwc->ev_buffs[0];
  93 +       evt = dwc->ev_buf;
  94
  95         count = dwc3_readl(dwc->regs, DWC3_GEVNTCOUNT(0));
  96         count &= DWC3_GEVNTCOUNT_MASK;