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: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>

diff --git a/drivers/dma/dw/core.c b/drivers/dma/dw/core.c
index 2ee3acc68a61f4db0bc421fa9651e5a5ad57f4a0..848d33507df9c0a9a3520e3c82080c09323f87e3 100644 (file)
--- a/drivers/dma/dw/core.c
+++ b/drivers/dma/dw/core.c
@@ -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);

diff --git a/drivers/dma/dw/regs.h b/drivers/dma/dw/regs.h
index 94f8f62ff884df543accecc435bd4598ceb8854d..89178641e80b5fec9280a288553f1c91a0204cad 100644 (file)
--- a/drivers/dma/dw/regs.h
+++ b/drivers/dma/dw/regs.h
@@ -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;