* [PATCH] staging: ralink-gdma: Fix various warnings in ralink-gdma @ 2019-03-05 10:37 Daniela Mormocea 2019-03-05 10:43 ` [Outreachy kernel] " Julia Lawall 0 siblings, 1 reply; 4+ messages in thread From: Daniela Mormocea @ 2019-03-05 10:37 UTC (permalink / raw) To: outreachy-kernel Fix warnings regarding uint32_t, unsigned int, and unnecessary line continuations Signed-off-by: Daniela Mormocea <daniela.mormocea@gmail.com> --- drivers/staging/ralink-gdma/ralink-gdma.c | 52 ++++++++++++++++--------------- 1 file changed, 27 insertions(+), 25 deletions(-) diff --git a/drivers/staging/ralink-gdma/ralink-gdma.c b/drivers/staging/ralink-gdma/ralink-gdma.c index d78042e..d3afe5d 100644 --- a/drivers/staging/ralink-gdma/ralink-gdma.c +++ b/drivers/staging/ralink-gdma/ralink-gdma.c @@ -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); } @@ -268,7 +268,7 @@ 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, " \ + 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)), @@ -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)); @@ -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; @@ -342,8 +342,8 @@ 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, " \ + 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)), @@ -361,7 +361,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)); @@ -377,21 +377,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", @@ -399,8 +399,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; @@ -741,7 +741,9 @@ static void gdma_dma_tasklet(unsigned long arg) atomic_inc(&dma_dev->cnt); gdma_start_transfer(dma_dev, chan); } else { - dev_dbg(dma_dev->ddev.dev, "chan %d no desc to issue\n", chan->id); + dev_dbg(dma_dev->ddev.dev, + "chan %d no desc to issue\n", + chan->id); } if (!dma_dev->chan_issued) break; @@ -753,7 +755,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); @@ -767,7 +769,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); @@ -819,7 +821,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), -- 2.7.4 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [Outreachy kernel] [PATCH] staging: ralink-gdma: Fix various warnings in ralink-gdma 2019-03-05 10:37 [PATCH] staging: ralink-gdma: Fix various warnings in ralink-gdma Daniela Mormocea @ 2019-03-05 10:43 ` Julia Lawall 2019-03-05 10:47 ` Dana Mormocea 0 siblings, 1 reply; 4+ messages in thread From: Julia Lawall @ 2019-03-05 10:43 UTC (permalink / raw) To: Daniela Mormocea; +Cc: outreachy-kernel On Tue, 5 Mar 2019, Daniela Mormocea wrote: > Fix warnings regarding uint32_t, unsigned int, and > unnecessary line continuations You should cut this up into a series. Don't fix multiple types of warnings in a single patch. First, you may make a mistake, and it is easier to revert a whole patch than part of one. Second, bigger patches are harder to review, especially when one has to look for different things in different places. julia > > Signed-off-by: Daniela Mormocea <daniela.mormocea@gmail.com> > --- > drivers/staging/ralink-gdma/ralink-gdma.c | 52 ++++++++++++++++--------------- > 1 file changed, 27 insertions(+), 25 deletions(-) > > diff --git a/drivers/staging/ralink-gdma/ralink-gdma.c b/drivers/staging/ralink-gdma/ralink-gdma.c > index d78042e..d3afe5d 100644 > --- a/drivers/staging/ralink-gdma/ralink-gdma.c > +++ b/drivers/staging/ralink-gdma/ralink-gdma.c > @@ -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); > } > @@ -268,7 +268,7 @@ 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, " \ > + 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)), > @@ -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)); > @@ -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; > > @@ -342,8 +342,8 @@ 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, " \ > + 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)), > @@ -361,7 +361,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)); > @@ -377,21 +377,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", > @@ -399,8 +399,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; > > @@ -741,7 +741,9 @@ static void gdma_dma_tasklet(unsigned long arg) > atomic_inc(&dma_dev->cnt); > gdma_start_transfer(dma_dev, chan); > } else { > - dev_dbg(dma_dev->ddev.dev, "chan %d no desc to issue\n", chan->id); > + dev_dbg(dma_dev->ddev.dev, > + "chan %d no desc to issue\n", > + chan->id); > } > if (!dma_dev->chan_issued) > break; > @@ -753,7 +755,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); > @@ -767,7 +769,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); > @@ -819,7 +821,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), > -- > 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 outreachy-kernel+unsubscribe@googlegroups.com. > To post to this group, send email to outreachy-kernel@googlegroups.com. > To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/20190305103753.GA15177%40pthm. > For more options, visit https://groups.google.com/d/optout. > ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Outreachy kernel] [PATCH] staging: ralink-gdma: Fix various warnings in ralink-gdma 2019-03-05 10:43 ` [Outreachy kernel] " Julia Lawall @ 2019-03-05 10:47 ` Dana Mormocea 2019-03-05 10:54 ` Julia Lawall 0 siblings, 1 reply; 4+ messages in thread From: Dana Mormocea @ 2019-03-05 10:47 UTC (permalink / raw) To: outreachy-kernel [-- Attachment #1.1: Type: text/plain, Size: 11054 bytes --] On Tuesday, March 5, 2019 at 12:43:14 PM UTC+2, Julia Lawall wrote: > > > > On Tue, 5 Mar 2019, Daniela Mormocea wrote: > > > Fix warnings regarding uint32_t, unsigned int, and > > unnecessary line continuations > > You should cut this up into a series. Don't fix multiple types of > warnings in a single patch. First, you may make a mistake, and it is > easier to revert a whole patch than part of one. Second, bigger patches > are harder to review, especially when one has to look for different things > in different places. > > julia > > > > > Signed-off-by: Daniela Mormocea <daniela....@gmail.com <javascript:>> > > --- > > drivers/staging/ralink-gdma/ralink-gdma.c | 52 > ++++++++++++++++--------------- > > 1 file changed, 27 insertions(+), 25 deletions(-) > > > > diff --git a/drivers/staging/ralink-gdma/ralink-gdma.c > b/drivers/staging/ralink-gdma/ralink-gdma.c > > index d78042e..d3afe5d 100644 > > --- a/drivers/staging/ralink-gdma/ralink-gdma.c > > +++ b/drivers/staging/ralink-gdma/ralink-gdma.c > > @@ -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); > > } > > @@ -268,7 +268,7 @@ 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, " \ > > + 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)), > > @@ -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)); > > @@ -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; > > > > @@ -342,8 +342,8 @@ 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, " \ > > + 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)), > > @@ -361,7 +361,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)); > > @@ -377,21 +377,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", > > @@ -399,8 +399,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; > > > > @@ -741,7 +741,9 @@ static void gdma_dma_tasklet(unsigned long arg) > > atomic_inc(&dma_dev->cnt); > > gdma_start_transfer(dma_dev, chan); > > } else { > > - dev_dbg(dma_dev->ddev.dev, "chan %d no > desc to issue\n", chan->id); > > + dev_dbg(dma_dev->ddev.dev, > > + "chan %d no desc to issue\n", > > + chan->id); > > } > > if (!dma_dev->chan_issued) > > break; > > @@ -753,7 +755,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); > > @@ -767,7 +769,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); > > @@ -819,7 +821,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), > > -- > > 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 outreachy-kern...@googlegroups.com <javascript:>. > > To post to this group, send email to outreach...@googlegroups.com > <javascript:>. > > To view this discussion on the web visit > https://groups.google.com/d/msgid/outreachy-kernel/20190305103753.GA15177%40pthm. > > > For more options, visit https://groups.google.com/d/optout. > > > Ok, I will revert these and mail them back I'm wondering if I should delete the '\' at the end of strings (and by doing this to get a "quoted string split across lines" warning) or should I leave them as they were? (with the '\' symbol at the end of the line? thank you [-- Attachment #1.2: Type: text/html, Size: 16280 bytes --] ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Outreachy kernel] [PATCH] staging: ralink-gdma: Fix various warnings in ralink-gdma 2019-03-05 10:47 ` Dana Mormocea @ 2019-03-05 10:54 ` Julia Lawall 0 siblings, 0 replies; 4+ messages in thread From: Julia Lawall @ 2019-03-05 10:54 UTC (permalink / raw) To: Dana Mormocea; +Cc: outreachy-kernel > Ok, I will revert these and mail them back > I'm wondering if I should delete the '\' at the end of strings > (and by doing this to get a "quoted string split across lines" warning) > or should I leave them as they were? (with the '\' symbol at the > end of the line? Actually, you should concatenate such string so that they are all on one line. That way if someone sees the message on their screen, they will be able to find it in the code using grep. It's ok if the string goes over 80 characters. Just as you shouldn't top post, you should also not necessarily reply at the very bottom. Put your response just below the relevant text in the original message. If there is a lot of irrelevant information in the message, you can delete it. You may want to indicate that a lot of lines have been deleted, or may not, if the lines seem completely irrelevant. julia ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-03-05 10:54 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2019-03-05 10:37 [PATCH] staging: ralink-gdma: Fix various warnings in ralink-gdma Daniela Mormocea 2019-03-05 10:43 ` [Outreachy kernel] " Julia Lawall 2019-03-05 10:47 ` Dana Mormocea 2019-03-05 10:54 ` Julia Lawall
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.