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 diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
  19 index 9e5c57c7..05b7ec3 100644
  20 --- a/drivers/usb/dwc3/core.c
  21 +++ b/drivers/usb/dwc3/core.c
  22 @@ -204,7 +204,7 @@ static void dwc3_free_event_buffers(struct dwc3 *dwc)
  23  {
  24         struct dwc3_event_buffer        *evt;
  25
  26 -       evt = dwc->ev_buffs[0];
  27 +       evt = dwc->ev_buf;
  28         if (evt)
  29                 dwc3_free_one_event_buffer(dwc, evt);
  30  }
  31 @@ -221,17 +221,12 @@ static int dwc3_alloc_event_buffers(struct dwc3 *dwc, unsigned length)
  32  {
  33         struct dwc3_event_buffer *evt;
  34
  35 -       dwc->ev_buffs = devm_kzalloc(dwc->dev, sizeof(*dwc->ev_buffs),
  36 -                       GFP_KERNEL);
  37 -       if (!dwc->ev_buffs)
  38 -               return -ENOMEM;
  39 -
  40         evt = dwc3_alloc_one_event_buffer(dwc, length);
  41         if (IS_ERR(evt)) {
  42                 dev_err(dwc->dev, "can't allocate event buffer\n");
  43                 return PTR_ERR(evt);
  44         }
  45 -       dwc->ev_buffs[0] = evt;
  46 +       dwc->ev_buf = evt;
  47
  48         return 0;
  49  }
  50 @@ -246,7 +241,7 @@ static int dwc3_event_buffers_setup(struct dwc3 *dwc)
  51  {
  52         struct dwc3_event_buffer        *evt;
  53
  54 -       evt = dwc->ev_buffs[0];
  55 +       evt = dwc->ev_buf;
  56         dwc3_trace(trace_dwc3_core,
  57                         "Event buf %p dma %08llx length %d\n",
  58                         evt->buf, (unsigned long long) evt->dma,
  59 @@ -269,7 +264,7 @@ static void dwc3_event_buffers_cleanup(struct dwc3 *dwc)
  60  {
  61         struct dwc3_event_buffer        *evt;
  62
  63 -       evt = dwc->ev_buffs[0];
  64 +       evt = dwc->ev_buf;
  65
  66         evt->lpos = 0;
  67
  68 diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h
  69 index be03999..df72234a 100644
  70 --- a/drivers/usb/dwc3/core.h
  71 +++ b/drivers/usb/dwc3/core.h
  72 @@ -753,7 +753,7 @@ struct dwc3 {
  73         struct platform_device  *xhci;
  74         struct resource         xhci_resources[DWC3_XHCI_RESOURCES_NUM];
  75
  76 -       struct dwc3_event_buffer **ev_buffs;
  77 +       struct dwc3_event_buffer *ev_buf;
  78         struct dwc3_ep          *eps[DWC3_ENDPOINTS_NUM];
  79
  80         struct usb_gadget       gadget;
  81 diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
  82 index 5e6a495..96dfde0 100644
  83 --- a/drivers/usb/dwc3/gadget.c
  84 +++ b/drivers/usb/dwc3/gadget.c
  85 @@ -2609,7 +2609,7 @@ static irqreturn_t dwc3_process_event_buf(struct dwc3 *dwc)
  86         int left;
  87         u32 reg;
  88
  89 -       evt = dwc->ev_buffs[0];
  90 +       evt = dwc->ev_buf;
  91         left = evt->count;
  92
  93         if (!(evt->flags & DWC3_EVENT_PENDING))
  94 @@ -2668,7 +2668,7 @@ static irqreturn_t dwc3_check_event_buf(struct dwc3 *dwc)
  95         u32 count;
  96         u32 reg;
  97
  98 -       evt = dwc->ev_buffs[0];
  99 +       evt = dwc->ev_buf;
 100
 101         count = dwc3_readl(dwc->regs, DWC3_GEVNTCOUNT(0));
 102         count &= DWC3_GEVNTCOUNT_MASK;
 103 --
 104 cgit v0.12