usb: musb: tusb6010: Clean up tusb_omap_dma structure

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>

diff --git a/drivers/usb/musb/tusb6010_omap.c b/drivers/usb/musb/tusb6010_omap.c
index e6959ccb4453522857582692d8dae9a21c154662..8b43c4b99f045325fd5c7160ee28cca73f8738af 100644 (file)
--- a/drivers/usb/musb/tusb6010_omap.c
+++ b/drivers/usb/musb/tusb6010_omap.c
@@ -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;
@@ -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);
@@ -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;
@@ -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;