diff options
author | Krzysztof Kozlowski <k.kozlowski@samsung.com> | 2014-12-29 08:01:30 -0500 |
---|---|---|
committer | Vinod Koul <vinod.koul@intel.com> | 2015-01-13 10:49:44 -0500 |
commit | a1a9becbf35899cd44ac1bea4a04f98e5adc9ffb (patch) | |
tree | a2d836b595b309c516407d2eb7a9f7e571fc6471 /drivers/dma/k3dma.c | |
parent | fbde286783f7c1e55e6c33575fa1a56f8ea77c90 (diff) |
dmaengine: k3: Fix duplicated function name and allmodconfig build
While splitting device control in db08425ebd51 ("dmaengine: k3:
Split device_control") new function with the same 'k3_dma_resume' name
was added, leading to build error:
drivers/dma/k3dma.c:823:12: error: conflicting types for ‘k3_dma_resume’
drivers/dma/k3dma.c:625:12: note: previous definition of ‘k3_dma_resume’ was here
Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'drivers/dma/k3dma.c')
-rw-r--r-- | drivers/dma/k3dma.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/dma/k3dma.c b/drivers/dma/k3dma.c index 49be7f687c4c..a4ff7e9e68be 100644 --- a/drivers/dma/k3dma.c +++ b/drivers/dma/k3dma.c | |||
@@ -601,7 +601,7 @@ static int k3_dma_terminate_all(struct dma_chan *chan) | |||
601 | return 0; | 601 | return 0; |
602 | } | 602 | } |
603 | 603 | ||
604 | static int k3_dma_pause(struct dma_chan *chan) | 604 | static int k3_dma_transfer_pause(struct dma_chan *chan) |
605 | { | 605 | { |
606 | struct k3_dma_chan *c = to_k3_chan(chan); | 606 | struct k3_dma_chan *c = to_k3_chan(chan); |
607 | struct k3_dma_dev *d = to_k3_dma(chan->device); | 607 | struct k3_dma_dev *d = to_k3_dma(chan->device); |
@@ -622,7 +622,7 @@ static int k3_dma_pause(struct dma_chan *chan) | |||
622 | return 0; | 622 | return 0; |
623 | } | 623 | } |
624 | 624 | ||
625 | static int k3_dma_resume(struct dma_chan *chan) | 625 | static int k3_dma_transfer_resume(struct dma_chan *chan) |
626 | { | 626 | { |
627 | struct k3_dma_chan *c = to_k3_chan(chan); | 627 | struct k3_dma_chan *c = to_k3_chan(chan); |
628 | struct k3_dma_dev *d = to_k3_dma(chan->device); | 628 | struct k3_dma_dev *d = to_k3_dma(chan->device); |
@@ -735,8 +735,8 @@ static int k3_dma_probe(struct platform_device *op) | |||
735 | d->slave.device_prep_slave_sg = k3_dma_prep_slave_sg; | 735 | d->slave.device_prep_slave_sg = k3_dma_prep_slave_sg; |
736 | d->slave.device_issue_pending = k3_dma_issue_pending; | 736 | d->slave.device_issue_pending = k3_dma_issue_pending; |
737 | d->slave.device_config = k3_dma_config; | 737 | d->slave.device_config = k3_dma_config; |
738 | d->slave.device_pause = k3_dma_pause; | 738 | d->slave.device_pause = k3_dma_transfer_pause; |
739 | d->slave.device_resume = k3_dma_resume; | 739 | d->slave.device_resume = k3_dma_transfer_resume; |
740 | d->slave.device_terminate_all = k3_dma_terminate_all; | 740 | d->slave.device_terminate_all = k3_dma_terminate_all; |
741 | d->slave.copy_align = DMA_ALIGN; | 741 | d->slave.copy_align = DMA_ALIGN; |
742 | 742 | ||