[PATCH v3 3/3] dmaengine: DW DMAC: move "nollp" to "dwc->flags"

[Eugeniy Paltsev]

Add "DW_DMA_IS_LLP_SUPPORTED" flag. Use this flag to get rid
of "dwc->nollp" as separate variable.

Signed-off-by: Eugeniy Paltsev 
---
 drivers/dma/dw/core.c | 11 ++-
 drivers/dma/dw/regs.h |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/drivers/dma/dw/core.c b/drivers/dma/dw/core.c
index 6281009..98beb16 100644
--- a/drivers/dma/dw/core.c
+++ b/drivers/dma/dw/core.c
@@ -227,7 +227,7 @@ static void dwc_dostart(struct dw_dma_chan *dwc, struct 
dw_desc *first)
return;
}
 
-   if (dwc->nollp) {
+   if (!test_bit(DW_DMA_IS_LLP_SUPPORTED, >flags)) {
was_soft_llp = test_and_set_bit(DW_DMA_IS_SOFT_LLP,
>flags);
if (was_soft_llp) {
@@ -1265,7 +1265,7 @@ struct dw_cyclic_desc *dw_dma_cyclic_prep(struct dma_chan 
*chan,
unsigned long   flags;
 
spin_lock_irqsave(>lock, flags);
-   if (dwc->nollp) {
+   if (!test_bit(DW_DMA_IS_LLP_SUPPORTED, >flags)) {
spin_unlock_irqrestore(>lock, flags);
dev_dbg(chan2dev(>chan),
"channel doesn't support LLP transfers\n");
@@ -1570,11 +1570,12 @@ int dw_dma_probe(struct dw_dma_chip *chip)
 */
dwc->block_size =
(4 << ((pdata->block_size >> 4 * i) & 0xf)) - 1;
-   dwc->nollp =
-   (dwc_params >> DWC_PARAMS_MBLK_EN & 0x1) == 0;
+   if ((dwc_params >> DWC_PARAMS_MBLK_EN & 0x1) != 0)
+   set_bit(DW_DMA_IS_LLP_SUPPORTED, >flags);
} else {
dwc->block_size = pdata->block_size;
-   dwc->nollp = pdata->is_nollp;
+   if (!pdata->is_nollp)
+   set_bit(DW_DMA_IS_LLP_SUPPORTED, >flags);
}
}
 
diff --git a/drivers/dma/dw/regs.h b/drivers/dma/dw/regs.h
index f65dd10..f50c0fc 100644
--- a/drivers/dma/dw/regs.h
+++ b/drivers/dma/dw/regs.h
@@ -218,6 +218,7 @@ enum dw_dmac_flags {
DW_DMA_IS_SOFT_LLP = 1,
DW_DMA_IS_PAUSED = 2,
DW_DMA_IS_INITIALIZED = 3,
+   DW_DMA_IS_LLP_SUPPORTED = 4,
 };
 
 struct dw_dma_chan {
@@ -242,7 +243,6 @@ struct dw_dma_chan {
 
/* hardware configuration */
unsigned intblock_size;
-   boolnollp;
 
/* custom slave configuration */
struct dw_dma_slave dws;
-- 
2.5.5

[PATCH v3 3/3] dmaengine: DW DMAC: move "nollp" to "dwc->flags"

[Eugeniy Paltsev]

Add "DW_DMA_IS_LLP_SUPPORTED" flag. Use this flag to get rid
of "dwc->nollp" as separate variable.

Signed-off-by: Eugeniy Paltsev 
---
 drivers/dma/dw/core.c | 11 ++-
 drivers/dma/dw/regs.h |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/drivers/dma/dw/core.c b/drivers/dma/dw/core.c
index 6281009..98beb16 100644
--- a/drivers/dma/dw/core.c
+++ b/drivers/dma/dw/core.c
@@ -227,7 +227,7 @@ static void dwc_dostart(struct dw_dma_chan *dwc, struct 
dw_desc *first)
return;
}
 
-   if (dwc->nollp) {
+   if (!test_bit(DW_DMA_IS_LLP_SUPPORTED, >flags)) {
was_soft_llp = test_and_set_bit(DW_DMA_IS_SOFT_LLP,
>flags);
if (was_soft_llp) {
@@ -1265,7 +1265,7 @@ struct dw_cyclic_desc *dw_dma_cyclic_prep(struct dma_chan 
*chan,
unsigned long   flags;
 
spin_lock_irqsave(>lock, flags);
-   if (dwc->nollp) {
+   if (!test_bit(DW_DMA_IS_LLP_SUPPORTED, >flags)) {
spin_unlock_irqrestore(>lock, flags);
dev_dbg(chan2dev(>chan),
"channel doesn't support LLP transfers\n");
@@ -1570,11 +1570,12 @@ int dw_dma_probe(struct dw_dma_chip *chip)
 */
dwc->block_size =
(4 << ((pdata->block_size >> 4 * i) & 0xf)) - 1;
-   dwc->nollp =
-   (dwc_params >> DWC_PARAMS_MBLK_EN & 0x1) == 0;
+   if ((dwc_params >> DWC_PARAMS_MBLK_EN & 0x1) != 0)
+   set_bit(DW_DMA_IS_LLP_SUPPORTED, >flags);
} else {
dwc->block_size = pdata->block_size;
-   dwc->nollp = pdata->is_nollp;
+   if (!pdata->is_nollp)
+   set_bit(DW_DMA_IS_LLP_SUPPORTED, >flags);
}
}
 
diff --git a/drivers/dma/dw/regs.h b/drivers/dma/dw/regs.h
index f65dd10..f50c0fc 100644
--- a/drivers/dma/dw/regs.h
+++ b/drivers/dma/dw/regs.h
@@ -218,6 +218,7 @@ enum dw_dmac_flags {
DW_DMA_IS_SOFT_LLP = 1,
DW_DMA_IS_PAUSED = 2,
DW_DMA_IS_INITIALIZED = 3,
+   DW_DMA_IS_LLP_SUPPORTED = 4,
 };
 
 struct dw_dma_chan {
@@ -242,7 +243,6 @@ struct dw_dma_chan {
 
/* hardware configuration */
unsigned intblock_size;
-   boolnollp;
 
/* custom slave configuration */
struct dw_dma_slave dws;
-- 
2.5.5