[PATCH] dmaengine: k3: Fix duplicated function name and allmodconfig build

[PATCH] dmaengine: k3: Fix duplicated function name and allmodconfig build

[Krzysztof Kozlowski]

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>
---
 drivers/dma/k3dma.c | 8 ++++----
 1 file 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)
 	return 0;
 }
 
-static int k3_dma_pause(struct dma_chan *chan)
+static int k3_dma_transfer_pause(struct dma_chan *chan)
 {
 	struct k3_dma_chan *c = to_k3_chan(chan);
 	struct k3_dma_dev *d = to_k3_dma(chan->device);
@@ -622,7 +622,7 @@ static int k3_dma_pause(struct dma_chan *chan)
 	return 0;
 }
 
-static int k3_dma_resume(struct dma_chan *chan)
+static int k3_dma_transfer_resume(struct dma_chan *chan)
 {
 	struct k3_dma_chan *c = to_k3_chan(chan);
 	struct k3_dma_dev *d = to_k3_dma(chan->device);
@@ -735,8 +735,8 @@ static int k3_dma_probe(struct platform_device *op)
 	d->slave.device_prep_slave_sg = k3_dma_prep_slave_sg;
 	d->slave.device_issue_pending = k3_dma_issue_pending;
 	d->slave.device_config = k3_dma_config;
-	d->slave.device_pause = k3_dma_pause;
-	d->slave.device_resume = k3_dma_resume;
+	d->slave.device_pause = k3_dma_transfer_pause;
+	d->slave.device_resume = k3_dma_transfer_resume;
 	d->slave.device_terminate_all = k3_dma_terminate_all;
 	d->slave.copy_align = DMA_ALIGN;
 
-- 
1.9.1

Re: [PATCH] dmaengine: k3: Fix duplicated function name and allmodconfig build

[Krzysztof Kozlowski]

On pon, 2014-12-29 at 14:01 +0100, Krzysztof Kozlowski wrote:
> 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>

Knock, knock.
Anyone care to pick it up? This is not a serious issue, the patch is
just to fix compiling (ARM, all{mod,yes}config on current next).

Best regards,
Krzysztof

> ---
>  drivers/dma/k3dma.c | 8 ++++----
>  1 file 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)
>  	return 0;
>  }
>  
> -static int k3_dma_pause(struct dma_chan *chan)
> +static int k3_dma_transfer_pause(struct dma_chan *chan)
>  {
>  	struct k3_dma_chan *c = to_k3_chan(chan);
>  	struct k3_dma_dev *d = to_k3_dma(chan->device);
> @@ -622,7 +622,7 @@ static int k3_dma_pause(struct dma_chan *chan)
>  	return 0;
>  }
>  
> -static int k3_dma_resume(struct dma_chan *chan)
> +static int k3_dma_transfer_resume(struct dma_chan *chan)
>  {
>  	struct k3_dma_chan *c = to_k3_chan(chan);
>  	struct k3_dma_dev *d = to_k3_dma(chan->device);
> @@ -735,8 +735,8 @@ static int k3_dma_probe(struct platform_device *op)
>  	d->slave.device_prep_slave_sg = k3_dma_prep_slave_sg;
>  	d->slave.device_issue_pending = k3_dma_issue_pending;
>  	d->slave.device_config = k3_dma_config;
> -	d->slave.device_pause = k3_dma_pause;
> -	d->slave.device_resume = k3_dma_resume;
> +	d->slave.device_pause = k3_dma_transfer_pause;
> +	d->slave.device_resume = k3_dma_transfer_resume;
>  	d->slave.device_terminate_all = k3_dma_terminate_all;
>  	d->slave.copy_align = DMA_ALIGN;
>  

Re: [PATCH] dmaengine: k3: Fix duplicated function name and allmodconfig build

[Vinod Koul]

On Mon, Dec 29, 2014 at 02:01:30PM +0100, Krzysztof Kozlowski wrote:
> 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
> 
Applied, thanks

-- 
~Vinod

> Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
> ---
>  drivers/dma/k3dma.c | 8 ++++----
>  1 file 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)
>  	return 0;
>  }
>  
> -static int k3_dma_pause(struct dma_chan *chan)
> +static int k3_dma_transfer_pause(struct dma_chan *chan)
>  {
>  	struct k3_dma_chan *c = to_k3_chan(chan);
>  	struct k3_dma_dev *d = to_k3_dma(chan->device);
> @@ -622,7 +622,7 @@ static int k3_dma_pause(struct dma_chan *chan)
>  	return 0;
>  }
>  
> -static int k3_dma_resume(struct dma_chan *chan)
> +static int k3_dma_transfer_resume(struct dma_chan *chan)
>  {
>  	struct k3_dma_chan *c = to_k3_chan(chan);
>  	struct k3_dma_dev *d = to_k3_dma(chan->device);
> @@ -735,8 +735,8 @@ static int k3_dma_probe(struct platform_device *op)
>  	d->slave.device_prep_slave_sg = k3_dma_prep_slave_sg;
>  	d->slave.device_issue_pending = k3_dma_issue_pending;
>  	d->slave.device_config = k3_dma_config;
> -	d->slave.device_pause = k3_dma_pause;
> -	d->slave.device_resume = k3_dma_resume;
> +	d->slave.device_pause = k3_dma_transfer_pause;
> +	d->slave.device_resume = k3_dma_transfer_resume;
>  	d->slave.device_terminate_all = k3_dma_terminate_all;
>  	d->slave.copy_align = DMA_ALIGN;
>  
> -- 
> 1.9.1
> 

--