Re: [PATCH 33/39] dmaengine: ste_dma40_ll: Use the BIT macro to replace ugly '(1 x)'s
On Wed, May 15, 2013 at 11:51 AM, Lee Jones lee.jo...@linaro.org wrote: The aim is to make the code that little more readable. Cc: Vinod Koul vinod.k...@intel.com Cc: Dan Williams d...@fb.com Cc: Per Forlin per.for...@stericsson.com Cc: Rabin Vincent ra...@rab.in Signed-off-by: Lee Jones lee.jo...@linaro.org Patch applied with Vinod's ACK. Yours, Linus Walleij -- To unsubscribe from this list: send the line unsubscribe linux-usb in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 33/39] dmaengine: ste_dma40_ll: Use the BIT macro to replace ugly '(1 x)'s
The aim is to make the code that little more readable.
Cc: Vinod Koul vinod.k...@intel.com
Cc: Dan Williams d...@fb.com
Cc: Per Forlin per.for...@stericsson.com
Cc: Rabin Vincent ra...@rab.in
Signed-off-by: Lee Jones lee.jo...@linaro.org
---
drivers/dma/ste_dma40_ll.c | 44 ++--
1 file changed, 22 insertions(+), 22 deletions(-)
diff --git a/drivers/dma/ste_dma40_ll.c b/drivers/dma/ste_dma40_ll.c
index 121c0ce..5ddd724 100644
--- a/drivers/dma/ste_dma40_ll.c
+++ b/drivers/dma/ste_dma40_ll.c
@@ -20,28 +20,28 @@ void d40_log_cfg(struct stedma40_chan_cfg *cfg,
/* src is mem? - increase address pos */
if (cfg-dir == DMA_MEM_TO_DEV ||
cfg-dir == DMA_MEM_TO_MEM)
- l1 |= 1 D40_MEM_LCSP1_SCFG_INCR_POS;
+ l1 |= BIT(D40_MEM_LCSP1_SCFG_INCR_POS);
/* dst is mem? - increase address pos */
if (cfg-dir == DMA_DEV_TO_MEM ||
cfg-dir == DMA_MEM_TO_MEM)
- l3 |= 1 D40_MEM_LCSP3_DCFG_INCR_POS;
+ l3 |= BIT(D40_MEM_LCSP3_DCFG_INCR_POS);
/* src is hw? - master port 1 */
if (cfg-dir == DMA_DEV_TO_MEM ||
cfg-dir == DMA_DEV_TO_DEV)
- l1 |= 1 D40_MEM_LCSP1_SCFG_MST_POS;
+ l1 |= BIT(D40_MEM_LCSP1_SCFG_MST_POS);
/* dst is hw? - master port 1 */
if (cfg-dir == DMA_MEM_TO_DEV ||
cfg-dir == DMA_DEV_TO_DEV)
- l3 |= 1 D40_MEM_LCSP3_DCFG_MST_POS;
+ l3 |= BIT(D40_MEM_LCSP3_DCFG_MST_POS);
- l3 |= 1 D40_MEM_LCSP3_DCFG_EIM_POS;
+ l3 |= BIT(D40_MEM_LCSP3_DCFG_EIM_POS);
l3 |= cfg-dst_info.psize D40_MEM_LCSP3_DCFG_PSIZE_POS;
l3 |= cfg-dst_info.data_width D40_MEM_LCSP3_DCFG_ESIZE_POS;
- l1 |= 1 D40_MEM_LCSP1_SCFG_EIM_POS;
+ l1 |= BIT(D40_MEM_LCSP1_SCFG_EIM_POS);
l1 |= cfg-src_info.psize D40_MEM_LCSP1_SCFG_PSIZE_POS;
l1 |= cfg-src_info.data_width D40_MEM_LCSP1_SCFG_ESIZE_POS;
@@ -58,39 +58,39 @@ void d40_phy_cfg(struct stedma40_chan_cfg *cfg, u32
*src_cfg, u32 *dst_cfg)
if ((cfg-dir == DMA_DEV_TO_MEM) ||
(cfg-dir == DMA_DEV_TO_DEV)) {
/* Set master port to 1 */
- src |= 1 D40_SREG_CFG_MST_POS;
+ src |= BIT(D40_SREG_CFG_MST_POS);
src |= D40_TYPE_TO_EVENT(cfg-dev_type);
if (cfg-src_info.flow_ctrl == STEDMA40_NO_FLOW_CTRL)
- src |= 1 D40_SREG_CFG_PHY_TM_POS;
+ src |= BIT(D40_SREG_CFG_PHY_TM_POS);
else
src |= 3 D40_SREG_CFG_PHY_TM_POS;
}
if ((cfg-dir == DMA_MEM_TO_DEV) ||
(cfg-dir == DMA_DEV_TO_DEV)) {
/* Set master port to 1 */
- dst |= 1 D40_SREG_CFG_MST_POS;
+ dst |= BIT(D40_SREG_CFG_MST_POS);
dst |= D40_TYPE_TO_EVENT(cfg-dev_type);
if (cfg-dst_info.flow_ctrl == STEDMA40_NO_FLOW_CTRL)
- dst |= 1 D40_SREG_CFG_PHY_TM_POS;
+ dst |= BIT(D40_SREG_CFG_PHY_TM_POS);
else
dst |= 3 D40_SREG_CFG_PHY_TM_POS;
}
/* Interrupt on end of transfer for destination */
- dst |= 1 D40_SREG_CFG_TIM_POS;
+ dst |= BIT(D40_SREG_CFG_TIM_POS);
/* Generate interrupt on error */
- src |= 1 D40_SREG_CFG_EIM_POS;
- dst |= 1 D40_SREG_CFG_EIM_POS;
+ src |= BIT(D40_SREG_CFG_EIM_POS);
+ dst |= BIT(D40_SREG_CFG_EIM_POS);
/* PSIZE */
if (cfg-src_info.psize != STEDMA40_PSIZE_PHY_1) {
- src |= 1 D40_SREG_CFG_PHY_PEN_POS;
+ src |= BIT(D40_SREG_CFG_PHY_PEN_POS);
src |= cfg-src_info.psize D40_SREG_CFG_PSIZE_POS;
}
if (cfg-dst_info.psize != STEDMA40_PSIZE_PHY_1) {
- dst |= 1 D40_SREG_CFG_PHY_PEN_POS;
+ dst |= BIT(D40_SREG_CFG_PHY_PEN_POS);
dst |= cfg-dst_info.psize D40_SREG_CFG_PSIZE_POS;
}
@@ -100,14 +100,14 @@ void d40_phy_cfg(struct stedma40_chan_cfg *cfg, u32
*src_cfg, u32 *dst_cfg)
/* Set the priority bit to high for the physical channel */
if (cfg-high_priority) {
- src |= 1 D40_SREG_CFG_PRI_POS;
- dst |= 1 D40_SREG_CFG_PRI_POS;
+ src |= BIT(D40_SREG_CFG_PRI_POS);
+ dst |= BIT(D40_SREG_CFG_PRI_POS);
}
if (cfg-src_info.big_endian)
- src |= 1 D40_SREG_CFG_LBE_POS;
+ src |= BIT(D40_SREG_CFG_LBE_POS);
if (cfg-dst_info.big_endian)
- dst |= 1 D40_SREG_CFG_LBE_POS;
+ dst |= BIT(D40_SREG_CFG_LBE_POS);
*src_cfg = src;
*dst_cfg = dst;
@@ -157,15 +157,15 @@ static int d40_phy_fill_lli(struct d40_phy_lli *lli,
/* If this scatter list entry is the last one, no next link */
if (next_lli == 0)
Re: [PATCH 33/39] dmaengine: ste_dma40_ll: Use the BIT macro to replace ugly '(1 x)'s
On Wed, May 15, 2013 at 10:51:56AM +0100, Lee Jones wrote:
The aim is to make the code that little more readable.
Cc: Vinod Koul vinod.k...@intel.com
Cc: Dan Williams d...@fb.com
Cc: Per Forlin per.for...@stericsson.com
Cc: Rabin Vincent ra...@rab.in
Signed-off-by: Lee Jones lee.jo...@linaro.org
Acked-by: Vinod Koul vinod.k...@intel.com
Hopefully all the BIT conversion in the driver are done in this
--
~Vinod
---
drivers/dma/ste_dma40_ll.c | 44
++--
1 file changed, 22 insertions(+), 22 deletions(-)
diff --git a/drivers/dma/ste_dma40_ll.c b/drivers/dma/ste_dma40_ll.c
index 121c0ce..5ddd724 100644
--- a/drivers/dma/ste_dma40_ll.c
+++ b/drivers/dma/ste_dma40_ll.c
@@ -20,28 +20,28 @@ void d40_log_cfg(struct stedma40_chan_cfg *cfg,
/* src is mem? - increase address pos */
if (cfg-dir == DMA_MEM_TO_DEV ||
cfg-dir == DMA_MEM_TO_MEM)
- l1 |= 1 D40_MEM_LCSP1_SCFG_INCR_POS;
+ l1 |= BIT(D40_MEM_LCSP1_SCFG_INCR_POS);
/* dst is mem? - increase address pos */
if (cfg-dir == DMA_DEV_TO_MEM ||
cfg-dir == DMA_MEM_TO_MEM)
- l3 |= 1 D40_MEM_LCSP3_DCFG_INCR_POS;
+ l3 |= BIT(D40_MEM_LCSP3_DCFG_INCR_POS);
/* src is hw? - master port 1 */
if (cfg-dir == DMA_DEV_TO_MEM ||
cfg-dir == DMA_DEV_TO_DEV)
- l1 |= 1 D40_MEM_LCSP1_SCFG_MST_POS;
+ l1 |= BIT(D40_MEM_LCSP1_SCFG_MST_POS);
/* dst is hw? - master port 1 */
if (cfg-dir == DMA_MEM_TO_DEV ||
cfg-dir == DMA_DEV_TO_DEV)
- l3 |= 1 D40_MEM_LCSP3_DCFG_MST_POS;
+ l3 |= BIT(D40_MEM_LCSP3_DCFG_MST_POS);
- l3 |= 1 D40_MEM_LCSP3_DCFG_EIM_POS;
+ l3 |= BIT(D40_MEM_LCSP3_DCFG_EIM_POS);
l3 |= cfg-dst_info.psize D40_MEM_LCSP3_DCFG_PSIZE_POS;
l3 |= cfg-dst_info.data_width D40_MEM_LCSP3_DCFG_ESIZE_POS;
- l1 |= 1 D40_MEM_LCSP1_SCFG_EIM_POS;
+ l1 |= BIT(D40_MEM_LCSP1_SCFG_EIM_POS);
l1 |= cfg-src_info.psize D40_MEM_LCSP1_SCFG_PSIZE_POS;
l1 |= cfg-src_info.data_width D40_MEM_LCSP1_SCFG_ESIZE_POS;
@@ -58,39 +58,39 @@ void d40_phy_cfg(struct stedma40_chan_cfg *cfg, u32
*src_cfg, u32 *dst_cfg)
if ((cfg-dir == DMA_DEV_TO_MEM) ||
(cfg-dir == DMA_DEV_TO_DEV)) {
/* Set master port to 1 */
- src |= 1 D40_SREG_CFG_MST_POS;
+ src |= BIT(D40_SREG_CFG_MST_POS);
src |= D40_TYPE_TO_EVENT(cfg-dev_type);
if (cfg-src_info.flow_ctrl == STEDMA40_NO_FLOW_CTRL)
- src |= 1 D40_SREG_CFG_PHY_TM_POS;
+ src |= BIT(D40_SREG_CFG_PHY_TM_POS);
else
src |= 3 D40_SREG_CFG_PHY_TM_POS;
}
if ((cfg-dir == DMA_MEM_TO_DEV) ||
(cfg-dir == DMA_DEV_TO_DEV)) {
/* Set master port to 1 */
- dst |= 1 D40_SREG_CFG_MST_POS;
+ dst |= BIT(D40_SREG_CFG_MST_POS);
dst |= D40_TYPE_TO_EVENT(cfg-dev_type);
if (cfg-dst_info.flow_ctrl == STEDMA40_NO_FLOW_CTRL)
- dst |= 1 D40_SREG_CFG_PHY_TM_POS;
+ dst |= BIT(D40_SREG_CFG_PHY_TM_POS);
else
dst |= 3 D40_SREG_CFG_PHY_TM_POS;
}
/* Interrupt on end of transfer for destination */
- dst |= 1 D40_SREG_CFG_TIM_POS;
+ dst |= BIT(D40_SREG_CFG_TIM_POS);
/* Generate interrupt on error */
- src |= 1 D40_SREG_CFG_EIM_POS;
- dst |= 1 D40_SREG_CFG_EIM_POS;
+ src |= BIT(D40_SREG_CFG_EIM_POS);
+ dst |= BIT(D40_SREG_CFG_EIM_POS);
/* PSIZE */
if (cfg-src_info.psize != STEDMA40_PSIZE_PHY_1) {
- src |= 1 D40_SREG_CFG_PHY_PEN_POS;
+ src |= BIT(D40_SREG_CFG_PHY_PEN_POS);
src |= cfg-src_info.psize D40_SREG_CFG_PSIZE_POS;
}
if (cfg-dst_info.psize != STEDMA40_PSIZE_PHY_1) {
- dst |= 1 D40_SREG_CFG_PHY_PEN_POS;
+ dst |= BIT(D40_SREG_CFG_PHY_PEN_POS);
dst |= cfg-dst_info.psize D40_SREG_CFG_PSIZE_POS;
}
@@ -100,14 +100,14 @@ void d40_phy_cfg(struct stedma40_chan_cfg *cfg, u32
*src_cfg, u32 *dst_cfg)
/* Set the priority bit to high for the physical channel */
if (cfg-high_priority) {
- src |= 1 D40_SREG_CFG_PRI_POS;
- dst |= 1 D40_SREG_CFG_PRI_POS;
+ src |= BIT(D40_SREG_CFG_PRI_POS);
+ dst |= BIT(D40_SREG_CFG_PRI_POS);
}
if (cfg-src_info.big_endian)
- src |= 1 D40_SREG_CFG_LBE_POS;
+ src |= BIT(D40_SREG_CFG_LBE_POS);
if (cfg-dst_info.big_endian)
- dst |= 1 D40_SREG_CFG_LBE_POS;
+ dst |= BIT(D40_SREG_CFG_LBE_POS);
*src_cfg = src;
*dst_cfg = dst;
@@ -157,15 +157,15 @@ static int
