staging: ralink-gdma: Avoid unnecessary line continuations
PATCH 1/1 staging: ralink-gdma: Avoid unnecessary line continuations
Get rid of unnecessary line continuations in boolean expressions, warning detected by checkpatch
--- drivers/staging/ralink-gdma/ralink-gdma.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-)
drivers/staging/ralink-gdma/ralink-gdma.c +15 -15
@@ -298,14 +298,14 @@ static int rt305x_gdma_start_transfer(struct gdma_dmaengine_chan *chan)if (chan->desc->direction ==DMA_MEM_TO_DEV ) { src_addr = sg->src_addr; dst_addr = chan->fifo_addr; - ctrl0 =GDMA_REG_CTRL0_DST_ADDR_FIXED | \ - (8 <<GDMA_RT305X_CTRL0_SRC_REQ_SHIFT ) | \ + ctrl0 =GDMA_REG_CTRL0_DST_ADDR_FIXED | + (8 <<GDMA_RT305X_CTRL0_SRC_REQ_SHIFT ) | (chan->slave_id <<GDMA_RT305X_CTRL0_DST_REQ_SHIFT ); }else if (chan->desc->direction ==DMA_DEV_TO_MEM ) { src_addr = chan->fifo_addr; dst_addr = sg->dst_addr; - ctrl0 =GDMA_REG_CTRL0_SRC_ADDR_FIXED | \ - (chan->slave_id <<GDMA_RT305X_CTRL0_SRC_REQ_SHIFT ) | \ + ctrl0 =GDMA_REG_CTRL0_SRC_ADDR_FIXED | + (chan->slave_id <<GDMA_RT305X_CTRL0_SRC_REQ_SHIFT ) | (8 <<GDMA_RT305X_CTRL0_DST_REQ_SHIFT ); }else if (chan->desc->direction ==DMA_MEM_TO_MEM ) {/*
@@ -314,8 +314,8 @@ static int rt305x_gdma_start_transfer(struct gdma_dmaengine_chan *chan)*/ src_addr = sg->src_addr; dst_addr = sg->dst_addr; - ctrl0 =GDMA_REG_CTRL0_SW_MODE | \ - (8 <<GDMA_REG_CTRL1_SRC_REQ_SHIFT ) | \ + ctrl0 =GDMA_REG_CTRL0_SW_MODE | + (8 <<GDMA_REG_CTRL1_SRC_REQ_SHIFT ) | (8 <<GDMA_REG_CTRL1_DST_REQ_SHIFT ); }else { dev_err(dma_dev->ddev.dev, "direction type %d error\n",
@@ -323,8 +323,8 @@ static int rt305x_gdma_start_transfer(struct gdma_dmaengine_chan *chan)return -EINVAL ; } - ctrl0 |= (sg->len <<GDMA_REG_CTRL0_TX_SHIFT ) | \ - (chan->burst_size <<GDMA_REG_CTRL0_BURST_SHIFT ) | \ + ctrl0 |= (sg->len <<GDMA_REG_CTRL0_TX_SHIFT ) | + (chan->burst_size <<GDMA_REG_CTRL0_BURST_SHIFT ) |GDMA_REG_CTRL0_DONE_INT |GDMA_REG_CTRL0_ENABLE ; ctrl1 = chan->id <<GDMA_REG_CTRL1_NEXT_SHIFT ;
@@ -376,21 +376,21 @@ static int rt3883_gdma_start_transfer(struct gdma_dmaengine_chan *chan) src_addr = sg->src_addr; dst_addr = chan->fifo_addr; ctrl0 =GDMA_REG_CTRL0_DST_ADDR_FIXED ; - ctrl1 = (32 <<GDMA_REG_CTRL1_SRC_REQ_SHIFT ) | \ + ctrl1 = (32 <<GDMA_REG_CTRL1_SRC_REQ_SHIFT ) | (chan->slave_id <<GDMA_REG_CTRL1_DST_REQ_SHIFT ); }else if (chan->desc->direction ==DMA_DEV_TO_MEM ) { src_addr = chan->fifo_addr; dst_addr = sg->dst_addr; ctrl0 =GDMA_REG_CTRL0_SRC_ADDR_FIXED ; - ctrl1 = (chan->slave_id <<GDMA_REG_CTRL1_SRC_REQ_SHIFT ) | \ - (32 <<GDMA_REG_CTRL1_DST_REQ_SHIFT ) | \ + ctrl1 = (chan->slave_id <<GDMA_REG_CTRL1_SRC_REQ_SHIFT ) | + (32 <<GDMA_REG_CTRL1_DST_REQ_SHIFT ) |GDMA_REG_CTRL1_COHERENT ; }else if (chan->desc->direction ==DMA_MEM_TO_MEM ) { src_addr = sg->src_addr; dst_addr = sg->dst_addr; ctrl0 =GDMA_REG_CTRL0_SW_MODE ; - ctrl1 = (32 <<GDMA_REG_CTRL1_SRC_REQ_SHIFT ) | \ - (32 <<GDMA_REG_CTRL1_DST_REQ_SHIFT ) | \ + ctrl1 = (32 <<GDMA_REG_CTRL1_SRC_REQ_SHIFT ) | + (32 <<GDMA_REG_CTRL1_DST_REQ_SHIFT ) |GDMA_REG_CTRL1_COHERENT ; }else { dev_err(dma_dev->ddev.dev, "direction type %d error\n",
@@ -398,8 +398,8 @@ static int rt3883_gdma_start_transfer(struct gdma_dmaengine_chan *chan)return -EINVAL ; } - ctrl0 |= (sg->len <<GDMA_REG_CTRL0_TX_SHIFT ) | \ - (chan->burst_size <<GDMA_REG_CTRL0_BURST_SHIFT ) | \ + ctrl0 |= (sg->len <<GDMA_REG_CTRL0_TX_SHIFT ) | + (chan->burst_size <<GDMA_REG_CTRL0_BURST_SHIFT ) |GDMA_REG_CTRL0_DONE_INT |GDMA_REG_CTRL0_ENABLE ; ctrl1 |= chan->id <<GDMA_REG_CTRL1_NEXT_SHIFT ;
Signature · 1 line
2.7.4
Quoted 2 lines · Daniela Mormocea
Get rid of unnecessary line continuations in boolean expressions, warning detected by checkpatch
Hi,
They should be in different patches, but they need to be in the same series, so Greg knows in what order to apply them.
When you send the second version, please also add v2 and describe the change since the first version under the ---
julia
Quoted 99 lines
Signed-off-by Daniela Mormocea <[email protected]>--- drivers/staging/ralink-gdma/ralink-gdma.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-)drivers/staging/ralink-gdma/ralink-gdma.c +15
-16@@ -298,14 +298,14 @@ static int rt305x_gdma_start_transfer(struct gdma_dmaengine_chan *chan)if (chan->desc->direction ==DMA_MEM_TO_DEV ) { src_addr = sg->src_addr; dst_addr = chan->fifo_addr; - ctrl0 =GDMA_REG_CTRL0_DST_ADDR_FIXED | \ - (8 <<GDMA_RT305X_CTRL0_SRC_REQ_SHIFT ) | \ + ctrl0 =GDMA_REG_CTRL0_DST_ADDR_FIXED | + (8 <<GDMA_RT305X_CTRL0_SRC_REQ_SHIFT ) | (chan->slave_id <<GDMA_RT305X_CTRL0_DST_REQ_SHIFT ); }else if (chan->desc->direction ==DMA_DEV_TO_MEM ) { src_addr = chan->fifo_addr; dst_addr = sg->dst_addr; - ctrl0 =GDMA_REG_CTRL0_SRC_ADDR_FIXED | \ - (chan->slave_id <<GDMA_RT305X_CTRL0_SRC_REQ_SHIFT ) | \ + ctrl0 =GDMA_REG_CTRL0_SRC_ADDR_FIXED | + (chan->slave_id <<GDMA_RT305X_CTRL0_SRC_REQ_SHIFT ) | (8 <<GDMA_RT305X_CTRL0_DST_REQ_SHIFT ); }else if (chan->desc->direction ==DMA_MEM_TO_MEM ) {/* @@ -314,8 +314,8 @@ static int rt305x_gdma_start_transfer(struct gdma_dmaengine_chan *chan)*/ src_addr = sg->src_addr; dst_addr = sg->dst_addr; - ctrl0 =GDMA_REG_CTRL0_SW_MODE | \ - (8 <<GDMA_REG_CTRL1_SRC_REQ_SHIFT ) | \ + ctrl0 =GDMA_REG_CTRL0_SW_MODE | + (8 <<GDMA_REG_CTRL1_SRC_REQ_SHIFT ) | (8 <<GDMA_REG_CTRL1_DST_REQ_SHIFT ); }else { dev_err(dma_dev->ddev.dev, "direction type %d error\n",@@ -323,8 +323,8 @@ static int rt305x_gdma_start_transfer(struct gdma_dmaengine_chan *chan)return -EINVAL ; } - ctrl0 |= (sg->len <<GDMA_REG_CTRL0_TX_SHIFT ) | \ - (chan->burst_size <<GDMA_REG_CTRL0_BURST_SHIFT ) | \ + ctrl0 |= (sg->len <<GDMA_REG_CTRL0_TX_SHIFT ) | + (chan->burst_size <<GDMA_REG_CTRL0_BURST_SHIFT ) |GDMA_REG_CTRL0_DONE_INT |GDMA_REG_CTRL0_ENABLE ; ctrl1 = chan->id <<GDMA_REG_CTRL1_NEXT_SHIFT ;@@ -376,21 +376,21 @@ static int rt3883_gdma_start_transfer(struct gdma_dmaengine_chan *chan) src_addr = sg->src_addr; dst_addr = chan->fifo_addr; ctrl0 =GDMA_REG_CTRL0_DST_ADDR_FIXED ; - ctrl1 = (32 <<GDMA_REG_CTRL1_SRC_REQ_SHIFT ) | \ + ctrl1 = (32 <<GDMA_REG_CTRL1_SRC_REQ_SHIFT ) | (chan->slave_id <<GDMA_REG_CTRL1_DST_REQ_SHIFT ); }else if (chan->desc->direction ==DMA_DEV_TO_MEM ) { src_addr = chan->fifo_addr; dst_addr = sg->dst_addr; ctrl0 =GDMA_REG_CTRL0_SRC_ADDR_FIXED ; - ctrl1 = (chan->slave_id <<GDMA_REG_CTRL1_SRC_REQ_SHIFT ) | \ - (32 <<GDMA_REG_CTRL1_DST_REQ_SHIFT ) | \ + ctrl1 = (chan->slave_id <<GDMA_REG_CTRL1_SRC_REQ_SHIFT ) | + (32 <<GDMA_REG_CTRL1_DST_REQ_SHIFT ) |GDMA_REG_CTRL1_COHERENT ; }else if (chan->desc->direction ==DMA_MEM_TO_MEM ) { src_addr = sg->src_addr; dst_addr = sg->dst_addr; ctrl0 =GDMA_REG_CTRL0_SW_MODE ; - ctrl1 = (32 <<GDMA_REG_CTRL1_SRC_REQ_SHIFT ) | \ - (32 <<GDMA_REG_CTRL1_DST_REQ_SHIFT ) | \ + ctrl1 = (32 <<GDMA_REG_CTRL1_SRC_REQ_SHIFT ) | + (32 <<GDMA_REG_CTRL1_DST_REQ_SHIFT ) |GDMA_REG_CTRL1_COHERENT ; }else { dev_err(dma_dev->ddev.dev, "direction type %d error\n",@@ -398,8 +398,8 @@ static int rt3883_gdma_start_transfer(struct gdma_dmaengine_chan *chan)return -EINVAL ; } - ctrl0 |= (sg->len <<GDMA_REG_CTRL0_TX_SHIFT ) | \ - (chan->burst_size <<GDMA_REG_CTRL0_BURST_SHIFT ) | \ + ctrl0 |= (sg->len <<GDMA_REG_CTRL0_TX_SHIFT ) | + (chan->burst_size <<GDMA_REG_CTRL0_BURST_SHIFT ) |GDMA_REG_CTRL0_DONE_INT |GDMA_REG_CTRL0_ENABLE ; ctrl1 |= chan->id <<GDMA_REG_CTRL1_NEXT_SHIFT ; --2.7.4
--
You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send email to [email protected].
To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/20190305113433.GA16894%40pthm.
For more options, visit https://groups.google.com/d/optout.
Quoted 32 lines · Julia Lawall
Quoted 2 lines · Daniela Mormocea
Get rid of unnecessary line continuations in boolean expressions, warning detected by checkpatch
Hi,
They should be in different patches, but they need to be in the same series, so Greg knows in what order to apply them.
When you send the second version, please also add v2 and describe the change since the first version under the ---
julia
Quoted 4 lines
Signed-off-by Daniela Mormocea <[email protected] <javascript:>>---
drivers/staging/ralink-gdma/ralink-gdma.c | 30+++++++++++++++---------------
Quoted 9 lines
1 file changed, 15 insertions(+), 15 deletions(-)Signature · 4 lines
2.7.4 -- You received this message because you are subscribed to the Google
Quoted 11 lines
Groups "outreachy-kernel" group.
Quoted 1 line
To unsubscribe from this group and stop receiving emails from it, send
an email to [email protected] <javascript:>.
Quoted 1 line
To post to this group, send email to [email protected]
<javascript:>.
Quoted 1 line
To view this discussion on the web visit
https://groups.google.com/d/msgid/outreachy-kernel/20190305113433.GA16894%40pthm.
Quoted 2 lines
For more options, visit https://groups.google.com/d/optout.
Ok, got it, I will resend them within the same patch with the appropriate tag
Thank you
Quoted 48 lines · Dana Mormocea
On Tuesday, March 5, 2019 at 1:37:22 PM UTC+2, Julia Lawall wrote:
On Tue, 5 Mar 2019, Daniela Mormocea wrote:
> Get rid of unnecessary line continuations in > boolean expressions, warning detected by checkpatch
Hi,
They should be in different patches, but they need to be in the same
series, so Greg knows in what order to apply them.When you send the second version, please also add v2 and describe the
change since the first version under the ---julia
>
> Signed-off-by: Daniela Mormocea <[email protected]> > ---
> ᅵdrivers/staging/ralink-gdma/ralink-gdma.c | 30
+++++++++++++++---------------
> ᅵ1 file changed, 15 insertions(+), 15 deletions(-) >>
> --
> 2.7.4
>
> --
> You received this message because you are subscribed to the
Google Groups "outreachy-kernel" group.
> To unsubscribe from this group and stop receiving emails from
it, send an email to [email protected].
> To post to this group, send email to
[email protected].
> To view this discussion on the web visithttps://groups.google.com/d/msgid/outreachy-kernel/20190305113433.GA16894%4 0pthm.
> For more options, visit https://groups.google.com/d/optout.
>
Quoted 2 lines
Ok, got it, I will resend them within the same patch with the appropriate tag
Just to be clear, they should be in the same series, not in the same patch.
julia
Quoted 14 lines
Thank you
--
You received this message because you are subscribed to the Google Groups
"outreachy-kernel" group.
To unsubscribe from this group and stop receiving emails from it, send an
email to [email protected].
To post to this group, send email to [email protected].
To view this discussion on the web visithttps://groups.google.com/d/msgid/outreachy-kernel/7ffe1ae9-0b5e-4093-b6fe- 385274a87a13%40googlegroups.com.
For more options, visit https://groups.google.com/d/optout.