Commit bdc0c753 authored by Javier Martin's avatar Javier Martin Committed by Vinod Koul
Browse files

dmaengine: imx-dma: remove 'imxdma_config_channel_hw' function. 



This function is only used once in the driver and uses some
intermediary variables that are not needed anymore. For this
reason it's been merged with 'imxdma_control'.

Signed-off-by: default avatarJavier Martin <javier.martin@vista-silicon.com>
Acked-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: default avatarVinod Koul <vinod.koul@linux.intel.com>
parent 3b4b6dfc

drivers/dma/imx-dma.c

+13 −33
Original line number Diff line number Diff line
@@ -313,32 +313,6 @@ static void imxdma_disable_hw(struct imxdma_channel *imxdmac) 
	local_irq_restore(flags);

}



static int

imxdma_config_channel_hw(struct imxdma_channel *imxdmac, unsigned int config_port,

	unsigned int config_mem, unsigned int dmareq, int hw_chaining)

{

	int channel = imxdmac->channel;

	u32 dreq = 0;



	imxdmac->internal.hw_chaining = 0;



	if (hw_chaining) {

		imxdmac->internal.hw_chaining = 1;

		if (!imxdma_hw_chain(&imxdmac->internal))

			return -EINVAL;

	}



	if (dmareq)

		dreq = CCR_REN;



	imxdmac->internal.ccr_from_device = config_port | (config_mem << 2) | dreq;

	imxdmac->internal.ccr_to_device = config_mem | (config_port << 2) | dreq;



	imx_dmav1_writel(dmareq, DMA_RSSR(channel));



	return 0;

}



static int

imxdma_setup_sg_hw(struct imxdma_desc *d,

		 struct scatterlist *sg, unsigned int sgcount,
@@ -628,7 +602,6 @@ static int imxdma_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd, 
{

	struct imxdma_channel *imxdmac = to_imxdma_chan(chan);

	struct dma_slave_config *dmaengine_cfg = (void *)arg;

	int ret;

	unsigned long flags;

	unsigned int mode = 0;
@@ -664,13 +637,20 @@ static int imxdma_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd, 
			mode = IMX_DMA_MEMSIZE_32;

			break;

		}

		ret = imxdma_config_channel_hw(imxdmac,

				mode | IMX_DMA_TYPE_FIFO,

				IMX_DMA_MEMSIZE_32 | IMX_DMA_TYPE_LINEAR,

				imxdmac->dma_request, 1);



		if (ret)

			return ret;

		imxdmac->internal.hw_chaining = 1;

		if (!imxdma_hw_chain(&imxdmac->internal))

			return -EINVAL;

		imxdmac->internal.ccr_from_device =

			(mode | IMX_DMA_TYPE_FIFO) |

			((IMX_DMA_MEMSIZE_32 | IMX_DMA_TYPE_LINEAR) << 2) |

			CCR_REN;

		imxdmac->internal.ccr_to_device =

			(IMX_DMA_MEMSIZE_32 | IMX_DMA_TYPE_LINEAR) |

			((mode | IMX_DMA_TYPE_FIFO) << 2) | CCR_REN;

		imx_dmav1_writel(imxdmac->dma_request,

				 DMA_RSSR(imxdmac->channel));



		/* Set burst length */

		imx_dmav1_writel(imxdmac->watermark_level * imxdmac->word_size,

				 DMA_BLR(imxdmac->channel));