diff options
author | Vinod Koul <vinod.koul@linux.intel.com> | 2011-10-14 12:20:31 -0400 |
---|---|---|
committer | Vinod Koul <vinod.koul@linux.intel.com> | 2011-11-17 04:05:26 -0500 |
commit | 8341544c9d95610f86b560333c7b22dd1096ca4f (patch) | |
tree | 5669dd849ef95905773f68f8d8528dfb8a5fad45 /drivers/usb/musb/ux500_dma.c | |
parent | 8af11fd3f013892c918a39acb691bc7469c5ad77 (diff) |
USB-musb: move to dma_transfer_direction
fixup usage of dma direction by introducing dma_transfer_direction,
this patch moves usb/musb driver to use new enum
Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
Cc: Felipe Balbi <balbi@ti.com>
Cc: Greg Kroah-Hartman <gregkh@suse.de>
Acked-by: Felipe Balbi <balbi@ti.com>
Acked-by: Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com>
Diffstat (limited to 'drivers/usb/musb/ux500_dma.c')
-rw-r--r-- | drivers/usb/musb/ux500_dma.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/musb/ux500_dma.c b/drivers/usb/musb/ux500_dma.c index ef4333f4bbe0..f8fd0ddee14a 100644 --- a/drivers/usb/musb/ux500_dma.c +++ b/drivers/usb/musb/ux500_dma.c | |||
@@ -112,7 +112,7 @@ static bool ux500_configure_channel(struct dma_channel *channel, | |||
112 | struct musb_hw_ep *hw_ep = ux500_channel->hw_ep; | 112 | struct musb_hw_ep *hw_ep = ux500_channel->hw_ep; |
113 | struct dma_chan *dma_chan = ux500_channel->dma_chan; | 113 | struct dma_chan *dma_chan = ux500_channel->dma_chan; |
114 | struct dma_async_tx_descriptor *dma_desc; | 114 | struct dma_async_tx_descriptor *dma_desc; |
115 | enum dma_data_direction direction; | 115 | enum dma_transfer_direction direction; |
116 | struct scatterlist sg; | 116 | struct scatterlist sg; |
117 | struct dma_slave_config slave_conf; | 117 | struct dma_slave_config slave_conf; |
118 | enum dma_slave_buswidth addr_width; | 118 | enum dma_slave_buswidth addr_width; |
@@ -132,7 +132,7 @@ static bool ux500_configure_channel(struct dma_channel *channel, | |||
132 | sg_dma_address(&sg) = dma_addr; | 132 | sg_dma_address(&sg) = dma_addr; |
133 | sg_dma_len(&sg) = len; | 133 | sg_dma_len(&sg) = len; |
134 | 134 | ||
135 | direction = ux500_channel->is_tx ? DMA_TO_DEVICE : DMA_FROM_DEVICE; | 135 | direction = ux500_channel->is_tx ? DMA_MEM_TO_DEV : DMA_DEV_TO_MEM; |
136 | addr_width = (len & 0x3) ? DMA_SLAVE_BUSWIDTH_1_BYTE : | 136 | addr_width = (len & 0x3) ? DMA_SLAVE_BUSWIDTH_1_BYTE : |
137 | DMA_SLAVE_BUSWIDTH_4_BYTES; | 137 | DMA_SLAVE_BUSWIDTH_4_BYTES; |
138 | 138 | ||