| Message ID | 1413042040-28222-10-git-send-email-vinod.koul@intel.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On Sat, Oct 11, 2014 at 09:10:38PM +0530, Vinod Koul wrote: > The drivers should use dmaengine_terminate_all() or dmaengine_slave_config() > API instead of accessing the device_control which will be deprecated soon > > Signed-off-by: Vinod Koul <vinod.koul@intel.com> Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -- To unsubscribe from this list: send the line "unsubscribe dmaengine" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi, On Sat, Oct 11, 2014 at 09:10:38PM +0530, Vinod Koul wrote: > The drivers should use dmaengine_terminate_all() or dmaengine_slave_config() > API instead of accessing the device_control which will be deprecated soon > > Signed-off-by: Vinod Koul <vinod.koul@intel.com> awesome. It looks like it doesn't have a direct dependency with the rest of the series, so I'll take this through my tree with Greg's ack, unless you shout ;-)
diff --git a/drivers/usb/musb/ux500_dma.c b/drivers/usb/musb/ux500_dma.c index 9aad00f..874833d 100644 --- a/drivers/usb/musb/ux500_dma.c +++ b/drivers/usb/musb/ux500_dma.c @@ -121,8 +121,7 @@ static bool ux500_configure_channel(struct dma_channel *channel, slave_conf.dst_maxburst = 16; slave_conf.device_fc = false; - dma_chan->device->device_control(dma_chan, DMA_SLAVE_CONFIG, - (unsigned long) &slave_conf); + dmaengine_slave_config(dma_chan, &slave_conf); dma_desc = dmaengine_prep_slave_sg(dma_chan, &sg, 1, direction, DMA_PREP_INTERRUPT | DMA_CTRL_ACK); @@ -246,9 +245,7 @@ static int ux500_dma_channel_abort(struct dma_channel *channel) musb_writew(epio, MUSB_RXCSR, csr); } - ux500_channel->dma_chan->device-> - device_control(ux500_channel->dma_chan, - DMA_TERMINATE_ALL, 0); + dmaengine_terminate_all(ux500_channel->dma_chan); channel->status = MUSB_DMA_STATUS_FREE; } return 0;
The drivers should use dmaengine_terminate_all() or dmaengine_slave_config() API instead of accessing the device_control which will be deprecated soon Signed-off-by: Vinod Koul <vinod.koul@intel.com> --- drivers/usb/musb/ux500_dma.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-)