Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 423f9cbf authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Vinod Koul
Browse files

dmaengine: dw: move dwc->initialized to dwc->flags 



We have already dedicated variable for flags, therefore no need to create an
additional storage for that. Covert dwc->initialized to use dwc->flags.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parent 5e09f98e

drivers/dma/dw/core.c

+4 −4
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ static void dwc_initialize(struct dw_dma_chan *dwc) 
	u32 cfghi = DWC_CFGH_FIFO_MODE;

	u32 cfglo = DWC_CFGL_CH_PRIOR(dwc->priority);



	if (dwc->initialized == true)

	if (test_bit(DW_DMA_IS_INITIALIZED, &dwc->flags))

		return;



	cfghi |= DWC_CFGH_DST_PER(dwc->dst_id);
@@ -150,7 +150,7 @@ static void dwc_initialize(struct dw_dma_chan *dwc) 
	channel_set_bit(dw, MASK.XFER, dwc->mask);

	channel_set_bit(dw, MASK.ERROR, dwc->mask);



	dwc->initialized = true;

	set_bit(DW_DMA_IS_INITIALIZED, &dwc->flags);

}



/*----------------------------------------------------------------------*/
@@ -1127,7 +1127,7 @@ static void dw_dma_off(struct dw_dma *dw) 
		cpu_relax();



	for (i = 0; i < dw->dma.chancnt; i++)

		dw->chan[i].initialized = false;

		clear_bit(DW_DMA_IS_INITIALIZED, &dw->chan[i].flags);

}



static void dw_dma_on(struct dw_dma *dw)
@@ -1236,7 +1236,7 @@ static void dwc_free_chan_resources(struct dma_chan *chan) 
	dwc->m_master = 0;

	dwc->p_master = 0;



	dwc->initialized = false;

	clear_bit(DW_DMA_IS_INITIALIZED, &dwc->flags);



	/* Disable interrupts */

	channel_clear_bit(dw, MASK.XFER, dwc->mask);

drivers/dma/dw/regs.h

+1 −1
Original line number Diff line number Diff line
@@ -217,6 +217,7 @@ enum dw_dmac_flags { 
	DW_DMA_IS_CYCLIC = 0,

	DW_DMA_IS_SOFT_LLP = 1,

	DW_DMA_IS_PAUSED = 2,

	DW_DMA_IS_INITIALIZED = 3,

};



struct dw_dma_chan {
@@ -225,7 +226,6 @@ struct dw_dma_chan { 
	u8				mask;

	u8				priority;

	enum dma_transfer_direction	direction;

	bool				initialized;



	/* software emulation of the LLP transfers */

	struct list_head	*tx_node_active;