[PATCH v3 12/15] dmaengine: dw: move dwc->paused to dwc->flags

[Andy Shevchenko]

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

Signed-off-by: Andy Shevchenko <andriy.shevche...@linux.intel.com>
---
 drivers/dma/dw/core.c | 12 +++++-------
 drivers/dma/dw/regs.h |  2 +-
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/drivers/dma/dw/core.c b/drivers/dma/dw/core.c
index 77df7ec..b481296 100644
--- a/drivers/dma/dw/core.c
+++ b/drivers/dma/dw/core.c
@@ -973,7 +973,7 @@ static int dwc_pause(struct dma_chan *chan)
        while (!(channel_readl(dwc, CFG_LO) & DWC_CFGL_FIFO_EMPTY) && count--)
                udelay(2);
 
-       dwc->paused = true;
+       set_bit(DW_DMA_IS_PAUSED, &dwc->flags);
 
        spin_unlock_irqrestore(&dwc->lock, flags);
 
@@ -986,7 +986,7 @@ static inline void dwc_chan_resume(struct dw_dma_chan *dwc)
 
        channel_writel(dwc, CFG_LO, cfglo & ~DWC_CFGL_CH_SUSP);
 
-       dwc->paused = false;
+       clear_bit(DW_DMA_IS_PAUSED, &dwc->flags);
 }
 
 static int dwc_resume(struct dma_chan *chan)
@@ -994,12 +994,10 @@ static int dwc_resume(struct dma_chan *chan)
        struct dw_dma_chan      *dwc = to_dw_dma_chan(chan);
        unsigned long           flags;
 
-       if (!dwc->paused)
-               return 0;
-
        spin_lock_irqsave(&dwc->lock, flags);
 
-       dwc_chan_resume(dwc);
+       if (test_bit(DW_DMA_IS_PAUSED, &dwc->flags))
+               dwc_chan_resume(dwc);
 
        spin_unlock_irqrestore(&dwc->lock, flags);
 
@@ -1068,7 +1066,7 @@ dwc_tx_status(struct dma_chan *chan,
        if (ret != DMA_COMPLETE)
                dma_set_residue(txstate, dwc_get_residue(dwc));
 
-       if (dwc->paused && ret == DMA_IN_PROGRESS)
+       if (test_bit(DW_DMA_IS_PAUSED, &dwc->flags) && ret == DMA_IN_PROGRESS)
                return DMA_PAUSED;
 
        return ret;
diff --git a/drivers/dma/dw/regs.h b/drivers/dma/dw/regs.h
index 4424940..6355f6c 100644
--- a/drivers/dma/dw/regs.h
+++ b/drivers/dma/dw/regs.h
@@ -216,6 +216,7 @@ enum dw_dma_msize {
 enum dw_dmac_flags {
        DW_DMA_IS_CYCLIC = 0,
        DW_DMA_IS_SOFT_LLP = 1,
+       DW_DMA_IS_PAUSED = 2,
 };
 
 struct dw_dma_chan {
@@ -224,7 +225,6 @@ struct dw_dma_chan {
        u8                              mask;
        u8                              priority;
        enum dma_transfer_direction     direction;
-       bool                            paused;
        bool                            initialized;
 
        /* software emulation of the LLP transfers */
-- 
2.7.0