On 01/25/2017 12:17 PM, Alexandre Bailon wrote:
> A pointer to musb is now present in the dma_controller structure.
> Remove the one present in tusb_omap_dma structure.
the subject line should be: usb: musb: tusb6010_omap: ...
> Signed-off-by: Alexandre Bailon <abailon@xxxxxxxxxxxx>
> ---
> drivers/usb/musb/tusb6010_omap.c | 7 +++----
> 1 file changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/usb/musb/tusb6010_omap.c b/drivers/usb/musb/tusb6010_omap.c
> index e6959cc..8b43c4b 100644
> --- 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;
>
- Péter
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
