aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/dma/hsu/hsu.c13
1 files changed, 2 insertions, 11 deletions
diff --git a/drivers/dma/hsu/hsu.c b/drivers/dma/hsu/hsu.c
index 683ba9b62795..e649b62431e2 100644
--- a/drivers/dma/hsu/hsu.c
+++ b/drivers/dma/hsu/hsu.c
@@ -58,7 +58,7 @@ static void hsu_dma_chan_start(struct hsu_dma_chan *hsuc)
58{ 58{
59 struct dma_slave_config *config = &hsuc->config; 59 struct dma_slave_config *config = &hsuc->config;
60 struct hsu_dma_desc *desc = hsuc->desc; 60 struct hsu_dma_desc *desc = hsuc->desc;
61 u32 bsr, mtsr; 61 u32 bsr = 0, mtsr = 0; /* to shut the compiler up */
62 u32 dcr = HSU_CH_DCR_CHSOE | HSU_CH_DCR_CHEI; 62 u32 dcr = HSU_CH_DCR_CHSOE | HSU_CH_DCR_CHEI;
63 unsigned int i, count; 63 unsigned int i, count;
64 64
@@ -68,9 +68,6 @@ static void hsu_dma_chan_start(struct hsu_dma_chan *hsuc)
68 } else if (hsuc->direction == DMA_DEV_TO_MEM) { 68 } else if (hsuc->direction == DMA_DEV_TO_MEM) {
69 bsr = config->src_maxburst; 69 bsr = config->src_maxburst;
70 mtsr = config->src_addr_width; 70 mtsr = config->src_addr_width;
71 } else {
72 /* Not supported direction */
73 return;
74 } 71 }
75 72
76 hsu_chan_disable(hsuc); 73 hsu_chan_disable(hsuc);
@@ -243,7 +240,7 @@ static struct dma_async_tx_descriptor *hsu_dma_prep_slave_sg(
243 240
244 desc->nents = sg_len; 241 desc->nents = sg_len;
245 desc->direction = direction; 242 desc->direction = direction;
246 desc->active = 0; 243 /* desc->active = 0 by kzalloc */
247 desc->status = DMA_IN_PROGRESS; 244 desc->status = DMA_IN_PROGRESS;
248 245
249 return vchan_tx_prep(&hsuc->vchan, &desc->vdesc, flags); 246 return vchan_tx_prep(&hsuc->vchan, &desc->vdesc, flags);
@@ -396,11 +393,6 @@ static int hsu_dma_terminate_all(struct dma_chan *chan)
396 return 0; 393 return 0;
397} 394}
398 395
399static int hsu_dma_alloc_chan_resources(struct dma_chan *chan)
400{
401 return 0;
402}
403
404static void hsu_dma_free_chan_resources(struct dma_chan *chan) 396static void hsu_dma_free_chan_resources(struct dma_chan *chan)
405{ 397{
406 vchan_free_chan_resources(to_virt_chan(chan)); 398 vchan_free_chan_resources(to_virt_chan(chan));
@@ -453,7 +445,6 @@ int hsu_dma_probe(struct hsu_dma_chip *chip)
453 dma_cap_set(DMA_SLAVE, hsu->dma.cap_mask); 445 dma_cap_set(DMA_SLAVE, hsu->dma.cap_mask);
454 dma_cap_set(DMA_PRIVATE, hsu->dma.cap_mask); 446 dma_cap_set(DMA_PRIVATE, hsu->dma.cap_mask);
455 447
456 hsu->dma.device_alloc_chan_resources = hsu_dma_alloc_chan_resources;
457 hsu->dma.device_free_chan_resources = hsu_dma_free_chan_resources; 448 hsu->dma.device_free_chan_resources = hsu_dma_free_chan_resources;
458 449
459 hsu->dma.device_prep_slave_sg = hsu_dma_prep_slave_sg; 450 hsu->dma.device_prep_slave_sg = hsu_dma_prep_slave_sg;