On Mon, Jan 23, 2017 at 05:48:06PM +0100, Alexandre Bailon wrote:
> A pointer to musb is now present in the dma_controller structure.
> Remove the one present in cppi41_dma_controller structure.
>
> Signed-off-by: Alexandre Bailon <abailon@xxxxxxxxxxxx>
> ---
> drivers/usb/musb/musb_cppi41.c | 28 +++++++++++++---------------
> 1 file changed, 13 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/usb/musb/musb_cppi41.c b/drivers/usb/musb/musb_cppi41.c
> index 1fe7eae..7253ea1 100644
> --- a/drivers/usb/musb/musb_cppi41.c
> +++ b/drivers/usb/musb/musb_cppi41.c
> @@ -30,7 +30,6 @@ struct cppi41_dma_controller {
> struct dma_controller controller;
> struct cppi41_dma_channel rx_channel[MUSB_DMA_NUM_CHANNELS];
> struct cppi41_dma_channel tx_channel[MUSB_DMA_NUM_CHANNELS];
> - struct musb *musb;
> struct hrtimer early_tx;
> struct list_head early_tx_list;
> u32 rx_mode;
> @@ -45,7 +44,7 @@ static void save_rx_toggle(struct cppi41_dma_channel *cppi41_channel)
>
> if (cppi41_channel->is_tx)
> return;
> - if (!is_host_active(cppi41_channel->controller->musb))
> + if (!is_host_active(cppi41_channel->controller->controller.musb))
> return;
>
> csr = musb_readw(cppi41_channel->hw_ep->regs, MUSB_RXCSR);
> @@ -78,7 +77,7 @@ static void update_rx_toggle(struct cppi41_dma_channel *cppi41_channel)
> if (!toggle && toggle == cppi41_channel->usb_toggle) {
> csr |= MUSB_RXCSR_H_DATATOGGLE | MUSB_RXCSR_H_WR_DATATOGGLE;
> musb_writew(cppi41_channel->hw_ep->regs, MUSB_RXCSR, csr);
> - musb_dbg(cppi41_channel->controller->musb,
> + musb_dbg(cppi41_channel->controller->controller.musb,
musb_dbg(musb, ...);
Regards,
-Bin.
--
To unsubscribe from this list: send the line "unsubscribe dmaengine" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
