Commit 3acb301d authored by Serge Semin's avatar Serge Semin Committed by Vinod Koul
Browse files

dmaengine: dw: Define encode_maxburst() above prepare_ctllo() callbacks 



As a preparatory change before dropping the encode_maxburst() callbacks
let's move dw_dma_encode_maxburst() and idma32_encode_maxburst() to being
defined above the dw_dma_prepare_ctllo() and idma32_prepare_ctllo()
methods respectively. That's required since the former methods will be
called from the later ones directly.

Signed-off-by: default avatarSerge Semin <fancer.lancer@gmail.com>
Acked-by: default avatarAndy Shevchenko <andy@kernel.org>
Link: https://lore.kernel.org/r/20240802075100.6475-5-fancer.lancer@gmail.com


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent 1fd6fe89

drivers/dma/dw/dw.c

+9 −9
Original line number Diff line number Diff line
@@ -64,6 +64,15 @@ static size_t dw_dma_block2bytes(struct dw_dma_chan *dwc, u32 block, u32 width) 
	return DWC_CTLH_BLOCK_TS(block) << width;

}



static void dw_dma_encode_maxburst(struct dw_dma_chan *dwc, u32 *maxburst)

{

	/*

	 * Fix burst size according to dw_dmac. We need to convert them as:

	 * 1 -> 0, 4 -> 1, 8 -> 2, 16 -> 3.

	 */

	*maxburst = *maxburst > 1 ? fls(*maxburst) - 2 : 0;

}



static u32 dw_dma_prepare_ctllo(struct dw_dma_chan *dwc)

{

	struct dma_slave_config	*sconfig = &dwc->dma_sconfig;
@@ -88,15 +97,6 @@ static u32 dw_dma_prepare_ctllo(struct dw_dma_chan *dwc) 
	       DWC_CTLL_DMS(dms) | DWC_CTLL_SMS(sms);

}



static void dw_dma_encode_maxburst(struct dw_dma_chan *dwc, u32 *maxburst)

{

	/*

	 * Fix burst size according to dw_dmac. We need to convert them as:

	 * 1 -> 0, 4 -> 1, 8 -> 2, 16 -> 3.

	 */

	*maxburst = *maxburst > 1 ? fls(*maxburst) - 2 : 0;

}



static void dw_dma_set_device_name(struct dw_dma *dw, int id)

{

	snprintf(dw->name, sizeof(dw->name), "dw:dmac%d", id);

drivers/dma/dw/idma32.c

+5 −5
Original line number Diff line number Diff line
@@ -199,6 +199,11 @@ static size_t idma32_block2bytes(struct dw_dma_chan *dwc, u32 block, u32 width) 
	return IDMA32C_CTLH_BLOCK_TS(block);

}



static void idma32_encode_maxburst(struct dw_dma_chan *dwc, u32 *maxburst)

{

	*maxburst = *maxburst > 1 ? fls(*maxburst) - 1 : 0;

}



static u32 idma32_prepare_ctllo(struct dw_dma_chan *dwc)

{

	struct dma_slave_config	*sconfig = &dwc->dma_sconfig;
@@ -213,11 +218,6 @@ static u32 idma32_prepare_ctllo(struct dw_dma_chan *dwc) 
	       DWC_CTLL_DST_MSIZE(dmsize) | DWC_CTLL_SRC_MSIZE(smsize);

}



static void idma32_encode_maxburst(struct dw_dma_chan *dwc, u32 *maxburst)

{

	*maxburst = *maxburst > 1 ? fls(*maxburst) - 1 : 0;

}



static void idma32_set_device_name(struct dw_dma *dw, int id)

{

	snprintf(dw->name, sizeof(dw->name), "idma32:dmac%d", id);