Skip to content

Commit

Permalink
usb: musb: tusb6010: Clean up tusb_omap_dma structure
Browse files Browse the repository at this point in the history
A pointer to musb is now present in the dma_controller structure.
Remove the one present in tusb_omap_dma structure.

Signed-off-by: Alexandre Bailon <abailon@baylibre.com>
Signed-off-by: Bin Liu <b-liu@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Alexandre Bailon authored and Greg Kroah-Hartman committed Feb 9, 2017
1 parent 995ee0e commit a96ca0d
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions drivers/usb/musb/tusb6010_omap.c
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ struct tusb_omap_dma_ch {

struct tusb_omap_dma {
struct dma_controller controller;
struct musb *musb;
void __iomem *tbase;

int ch;
Expand Down Expand Up @@ -497,7 +496,7 @@ tusb_omap_dma_allocate(struct dma_controller *c,
u32 reg;

tusb_dma = container_of(c, struct tusb_omap_dma, controller);
musb = tusb_dma->musb;
musb = tusb_dma->controller.musb;
tbase = musb->ctrl_base;

reg = musb_readl(tbase, TUSB_DMA_INT_MASK);
Expand Down Expand Up @@ -534,7 +533,7 @@ tusb_omap_dma_allocate(struct dma_controller *c,
dev_name = "TUSB receive";
}

chdat->musb = tusb_dma->musb;
chdat->musb = tusb_dma->controller.musb;
chdat->tbase = tusb_dma->tbase;
chdat->hw_ep = hw_ep;
chdat->epnum = hw_ep->epnum;
Expand Down Expand Up @@ -667,7 +666,7 @@ tusb_dma_controller_create(struct musb *musb, void __iomem *base)
if (!tusb_dma)
goto out;

tusb_dma->musb = musb;
tusb_dma->controller.musb = musb;
tusb_dma->tbase = musb->ctrl_base;

tusb_dma->ch = -1;
Expand Down

0 comments on commit a96ca0d

Please sign in to comment.