staging: ralink-gdma: Fix type warning
v2 cover staging: ralink-gdma: Fix type warning
Complete unsigned int type as indicated by checkpatch
---
Changes in v2:
-make these a patch series
drivers/staging/ralink-gdma/ralink-gdma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/ralink-gdma/ralink-gdma.c +1 -1
@@ -164,7 +164,7 @@ static inline uint32_t gdma_dma_read(struct gdma_dma_dev *dma_dev, }static inline void gdma_dma_write (struct gdma_dma_dev *dma_dev, -unsigned reg,uint32_t val) +unsigned int reg,uint32_t val) {writel (val, dma_dev->base + reg); }
Signature · 1 line
2.7.4
PATCH v2 1/4 staging: ralink-gdma: Avoid unnecessary line continuations in string
Fix split string in multiple lines
---
Changes in v2:
-make these a patch series
drivers/staging/ralink-gdma/ralink-gdma.c | 39 +++++++++++++++---------------- 1 file changed, 19 insertions(+), 20 deletions(-)
drivers/staging/ralink-gdma/ralink-gdma.c +19 -20
@@ -268,14 +268,14 @@ static int gdma_dma_terminate_all(struct dma_chan *c)static void rt305x_dump_reg (struct gdma_dma_dev *dma_dev,int id) { -dev_dbg (dma_dev->ddev.dev,"chan %d, src %08x, dst %08x, ctr0 %08x, " \ -"ctr1 %08x, intr %08x, signal %08x\n" , id, -gdma_dma_read (dma_dev,GDMA_REG_SRC_ADDR (id)), -gdma_dma_read (dma_dev,GDMA_REG_DST_ADDR (id)), -gdma_dma_read (dma_dev,GDMA_REG_CTRL0 (id)), -gdma_dma_read (dma_dev,GDMA_REG_CTRL1 (id)), -gdma_dma_read (dma_dev,GDMA_RT305X_STATUS_INT ), -gdma_dma_read (dma_dev,GDMA_RT305X_STATUS_SIGNAL )); +dev_dbg (dma_dev->ddev.dev,"chan %d, src %08x, dst %08x, ctr0 %08x, ctr1 %08x, intr %08x, signal %08x\n" , + id, +gdma_dma_read (dma_dev,GDMA_REG_SRC_ADDR (id)), +gdma_dma_read (dma_dev,GDMA_REG_DST_ADDR (id)), +gdma_dma_read (dma_dev,GDMA_REG_CTRL0 (id)), +gdma_dma_read (dma_dev,GDMA_REG_CTRL1 (id)), +gdma_dma_read (dma_dev,GDMA_RT305X_STATUS_INT ), +gdma_dma_read (dma_dev,GDMA_RT305X_STATUS_SIGNAL )); }static int rt305x_gdma_start_transfer (struct gdma_dmaengine_chan *chan)
@@ -342,18 +342,17 @@ static int rt305x_gdma_start_transfer(struct gdma_dmaengine_chan *chan)static void rt3883_dump_reg (struct gdma_dma_dev *dma_dev,int id) { -dev_dbg (dma_dev->ddev.dev,"chan %d, src %08x, dst %08x, ctr0 %08x, " \ -"ctr1 %08x, unmask %08x, done %08x, " \ -"req %08x, ack %08x, fin %08x\n" , id, -gdma_dma_read (dma_dev,GDMA_REG_SRC_ADDR (id)), -gdma_dma_read (dma_dev,GDMA_REG_DST_ADDR (id)), -gdma_dma_read (dma_dev,GDMA_REG_CTRL0 (id)), -gdma_dma_read (dma_dev,GDMA_REG_CTRL1 (id)), -gdma_dma_read (dma_dev,GDMA_REG_UNMASK_INT ), -gdma_dma_read (dma_dev,GDMA_REG_DONE_INT ), -gdma_dma_read (dma_dev,GDMA_REG_REQSTS ), -gdma_dma_read (dma_dev,GDMA_REG_ACKSTS ), -gdma_dma_read (dma_dev,GDMA_REG_FINSTS )); +dev_dbg (dma_dev->ddev.dev,"chan %d, src %08x, dst %08x, ctr0 %08x, ctr1 %08x, unmask %08x, done %08x, req %08x, ack %08x, fin %08x\n" , + id, +gdma_dma_read (dma_dev,GDMA_REG_SRC_ADDR (id)), +gdma_dma_read (dma_dev,GDMA_REG_DST_ADDR (id)), +gdma_dma_read (dma_dev,GDMA_REG_CTRL0 (id)), +gdma_dma_read (dma_dev,GDMA_REG_CTRL1 (id)), +gdma_dma_read (dma_dev,GDMA_REG_UNMASK_INT ), +gdma_dma_read (dma_dev,GDMA_REG_DONE_INT ), +gdma_dma_read (dma_dev,GDMA_REG_REQSTS ), +gdma_dma_read (dma_dev,GDMA_REG_ACKSTS ), +gdma_dma_read (dma_dev,GDMA_REG_FINSTS )); }static int rt3883_gdma_start_transfer (struct gdma_dmaengine_chan *chan)
Signature · 1 line
2.7.4
PATCH v2 2/4 staging: ralink-gdma: Replace from uint32_t to u32
In reply to Daniela MormoceaReplace all uintr32_t with u32 to avoid getting
checkpatch warning
---
Changes in v2:
-make these a patch series
drivers/staging/ralink-gdma/ralink-gdma.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/staging/ralink-gdma/ralink-gdma.c +4 -4
@@ -283,7 +283,7 @@ static int rt305x_gdma_start_transfer(struct gdma_dmaengine_chan *chan)struct gdma_dma_dev *dma_dev =gdma_dma_chan_get_dev (chan);dma_addr_t src_addr, dst_addr;struct gdma_dma_sg *sg; -uint32_t ctrl0, ctrl1; +u32 ctrl0, ctrl1;/* verify chan is already stopped */ ctrl0 =gdma_dma_read (dma_dev,GDMA_REG_CTRL0 (chan->id));
@@ -360,7 +360,7 @@ static int rt3883_gdma_start_transfer(struct gdma_dmaengine_chan *chan)struct gdma_dma_dev *dma_dev =gdma_dma_chan_get_dev (chan);dma_addr_t src_addr, dst_addr;struct gdma_dma_sg *sg; -uint32_t ctrl0, ctrl1; +u32 ctrl0, ctrl1;/* verify chan is already stopped */ ctrl0 =gdma_dma_read (dma_dev,GDMA_REG_CTRL0 (chan->id));
@@ -752,7 +752,7 @@ static void gdma_dma_tasklet(unsigned long arg)static void rt305x_gdma_init (struct gdma_dma_dev *dma_dev) { -uint32_t gct; +u32 gct;/* all chans round robin */ gdma_dma_write (dma_dev,GDMA_RT305X_GCT ,GDMA_REG_GCT_ARBIT_RR );
@@ -766,7 +766,7 @@ static void rt305x_gdma_init(struct gdma_dma_dev *dma_dev)static void rt3883_gdma_init (struct gdma_dma_dev *dma_dev) { -uint32_t gct; +u32 gct;/* all chans round robin */ gdma_dma_write (dma_dev,GDMA_REG_GCT ,GDMA_REG_GCT_ARBIT_RR );
Signature · 1 line
2.7.4
PATCH v2 3/4 staging: ralink-gdma: Avoid unnecessary line continuations
In reply to Daniela MormoceaGet rid of unnecessary line continuations in boolean expressions, warning detected by checkpatch
---
Changes in v2:
-make these a patch series
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
PATCH v2 4/4 staging: ralink-gdma: Remove whitespace and add blank line
In reply to Daniela MormoceaDelete unnecessary whitespace after cast, and add blank line after declarations to avoid warnings.
---
Changes in v2:
-make these a patch series
drivers/staging/ralink-gdma/ralink-gdma.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/staging/ralink-gdma/ralink-gdma.c +2 -1
@@ -127,6 +127,7 @@ struct gdma_dma_dev {struct gdma_data *data;void __iomem *base;struct tasklet_struct task; +volatile unsigned long chan_issued;atomic_t cnt;
@@ -818,7 +819,7 @@ static int gdma_dma_probe(struct platform_device *pdev) match =of_match_device (gdma_of_match_table, &pdev->dev);if (!match)return -EINVAL ; - data = (struct gdma_data *) match->data; + data = (struct gdma_data *)match->data; dma_dev = devm_kzalloc(&pdev->dev, struct_size(dma_dev, chan, data->chancnt),
Signature · 1 line
2.7.4
Re: [Outreachy kernel] [PATCH v2 4/4] staging: ralink-gdma: Remove whitespace and add blank line
Quoted 16 lines · Daniela Mormocea
Delete unnecessary whitespace after cast, and add blank line after declarations to avoid warnings.
Signed-off-by Daniela Mormocea <[email protected]>---
Changes in v2:(quoted diff) +0
-1-make these a patch series drivers/staging/ralink-gdma/ralink-gdma.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/staging/ralink-gdma/ralink-gdma.c +0
-0
drivers/staging/ralink-gdma/ralink-gdma.c struct gdma_dma_dev { · line 132
Quoted 6 lines
drivers/staging/ralink-gdma/ralink-gdma.c +1
-0@@ -127,6 +127,7 @@ struct gdma_dma_dev {struct gdma_data *data;void __iomem *base;struct tasklet_struct task; +volatile unsigned long chan_issued;atomic_t cnt;
Checkpatch is wrong here, there should not be an extra line :(
It's getting confused as the code should not have 'volatile', but that's a change that is much more complex to make.
drivers/staging/ralink-gdma/ralink-gdma.c static int gdma_dma_probe(struct platform_device *pdev) · line 822
Quoted 7 lines
drivers/staging/ralink-gdma/ralink-gdma.c +1
-1@@ -818,7 +819,7 @@ static int gdma_dma_probe(struct platform_device *pdev) match =of_match_device (gdma_of_match_table, &pdev->dev);if (!match)return -EINVAL ; - data = (struct gdma_data *) match->data; + data = (struct gdma_data *)match->data;
this one is fine.
Why did you do two different types of thing in the same patch? Even if both of them were ok, I would have asked you to split this into two different patches.
The other 3 patches were fine, just fix this one up and resend it.
thanks,
greg k-h
PATCH v3 4/4 Fix unnecessary space after cast
In reply to Daniela MormoceaDelete space after cast
---
Changes in v3:
-correct mistake from previous patch, regarding
a blank line
drivers/staging/ralink-gdma/ralink-gdma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/ralink-gdma/ralink-gdma.c +1 -1
@@ -818,7 +818,7 @@ static int gdma_dma_probe(struct platform_device *pdev) match =of_match_device (gdma_of_match_table, &pdev->dev);if (!match)return -EINVAL ; - data = (struct gdma_data *) match->data; + data = (struct gdma_data *)match->data; dma_dev = devm_kzalloc(&pdev->dev, struct_size(dma_dev, chan, data->chancnt),
Signature · 1 line
2.7.4
Greg KH
maintainerRe: [Outreachy kernel] [PATCH v3 4/4] Fix unnecessary space after cast
Quoted 7 lines · Daniela Mormocea
Delete space after cast
Signed-off-by Daniela Mormocea <[email protected]>---
Changes in v3:
-correct mistake from previous patch, regarding
a blank line
Your subject line forgot to mention the driver being modified here :(