From: Andy Shevchenko <andriy.shevche...@linux.intel.com>

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.shevche...@linux.intel.com>
Signed-off-by: Mans Rullgard <m...@mansr.com>
---
 drivers/dma/dw/core.c | 8 ++++----
 drivers/dma/dw/regs.h | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/dma/dw/core.c b/drivers/dma/dw/core.c
index 7785f29b8792..cd345432fa33 100644
--- a/drivers/dma/dw/core.c
+++ b/drivers/dma/dw/core.c
@@ -138,7 +138,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;
 
        if (dws) {
@@ -163,7 +163,7 @@ static void dwc_initialize(struct dw_dma_chan *dwc)
        channel_set_bit(dw, MASK.BLOCK, dwc->mask);
        channel_set_bit(dw, MASK.ERROR, dwc->mask);
 
-       dwc->initialized = true;
+       set_bit(DW_DMA_IS_INITIALIZED, &dwc->flags);
 }
 
 /*----------------------------------------------------------------------*/
@@ -1108,7 +1108,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)
@@ -1201,13 +1201,13 @@ static void dwc_free_chan_resources(struct dma_chan 
*chan)
        spin_lock_irqsave(&dwc->lock, flags);
        list_splice_init(&dwc->free_list, &list);
        dwc->descs_allocated = 0;
-       dwc->initialized = false;
 
        /* Disable interrupts */
        channel_clear_bit(dw, MASK.XFER, dwc->mask);
        channel_clear_bit(dw, MASK.BLOCK, dwc->mask);
        channel_clear_bit(dw, MASK.ERROR, dwc->mask);
 
+       clear_bit(DW_DMA_IS_INITIALIZED, &dwc->flags);
        spin_unlock_irqrestore(&dwc->lock, flags);
 
        /* Disable controller in case it was a last user */
diff --git a/drivers/dma/dw/regs.h b/drivers/dma/dw/regs.h
index acdd6e820af1..0deb04562c33 100644
--- 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;
-- 
2.7.0

Reply via email to