Commit a1a9becb authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Vinod Koul
Browse files

dmaengine: k3: Fix duplicated function name and allmodconfig build 



While splitting device control in db08425e ("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: default avatarKrzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parent fbde2867

drivers/dma/k3dma.c

+4 −4
Original line number Diff line number Diff line
@@ -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;

CRA Git | Maintained and supported by SUSTech CRA and CCSE