Skip to contentSkip to conversation

staging: ralink-gdma: Fix various warnings in ralink-gdma

PATCH In review Daniela Mormocea 2 participants 4 messages Mar 5, 2019 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 staging: ralink-gdma: Fix various warnings in ralink-gdma

Fix warnings regarding uint32_t, unsigned int, and unnecessary line continuations

---
 drivers/staging/ralink-gdma/ralink-gdma.c | 52 ++++++++++++++++---------------
 1 file changed, 27 insertions(+), 25 deletions(-)
drivers/staging/ralink-gdma/ralink-gdma.c +27 -25
index d78042e..d3afe5d 100644
@@ -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),
Signature · 1 line
2.7.4
#1 lore raw
Quoted 2 lines · Daniela Mormocea

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

Quoted 184 lines
---
 drivers/staging/ralink-gdma/ralink-gdma.c | 52 ++++++++++++++++---------------
 1 file changed, 27 insertions(+), 25 deletions(-)
drivers/staging/ralink-gdma/ralink-gdma.c +27 -26
index d78042e..d3afe5d 100644
@@ -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 [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/20190305103753.GA15177%40pthm.
For more options, visit https://groups.google.com/d/optout.

#2 lore raw
Quoted 222 lines · Julia Lawall
Quoted 2 lines · Daniela Mormocea

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

Quoted 4 lines
Signed-off-by Daniela Mormocea <[email protected] <javascript:>>

---

 drivers/staging/ralink-gdma/ralink-gdma.c | 52 

++++++++++++++++---------------

Review

Quoted 3 lines
 1 file changed, 27 insertions(+), 25 deletions(-) 
(quoted diff) +0 -0

b/drivers/staging/ralink-gdma/ralink-gdma.c

drivers/staging/ralink-gdma/ralink-gdma.c static inline uint32_t gdma_dma_read(struct

Quoted 4 lines

index d78042e..d3afe5d 100644

drivers/staging/ralink-gdma/ralink-gdma.c +0 -0
@@ -164,7 +164,7 @@ static inline uint32_t gdma_dma_read(struct 

gdma_dma_dev *dma_dev,

drivers/staging/ralink-gdma/ralink-gdma.c static int gdma_dma_terminate_all(struct dma_chan

Quoted 9 lines
drivers/staging/ralink-gdma/ralink-gdma.c +1 -1
 } 
 
 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)

drivers/staging/ralink-gdma/ralink-gdma.c static int gdma_dma_terminate_all(struct dma_chan *c)

Quoted 4 lines
drivers/staging/ralink-gdma/ralink-gdma.c +0 -1
 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, " \

drivers/staging/ralink-gdma/ralink-gdma.c static int gdma_dma_terminate_all(struct dma_chan · line 270

Quoted 1 line
drivers/staging/ralink-gdma/ralink-gdma.c +1 -0
+        dev_dbg(dma_dev->ddev.dev, "chan %d, src %08x, dst %08x, ctr0 

%08x, "

drivers/staging/ralink-gdma/ralink-gdma.c static int rt305x_gdma_start_transfer(struct

Quoted 4 lines
drivers/staging/ralink-gdma/ralink-gdma.c +0 -0
                         "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)

drivers/staging/ralink-gdma/ralink-gdma.c static int rt305x_gdma_start_transfer(struct

Quoted 9 lines
drivers/staging/ralink-gdma/ralink-gdma.c +1 -1
         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)

drivers/staging/ralink-gdma/ralink-gdma.c static int rt305x_gdma_start_transfer(struct gdma_dmaengine_chan *chan)

Quoted 8 lines
drivers/staging/ralink-gdma/ralink-gdma.c +2 -2
         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);

drivers/staging/ralink-gdma/ralink-gdma.c static int rt305x_gdma_start_transfer(struct gdma_dmaengine_chan *chan)

Quoted 5 lines
drivers/staging/ralink-gdma/ralink-gdma.c +0 -2
         } 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) | \

drivers/staging/ralink-gdma/ralink-gdma.c static int rt305x_gdma_start_transfer(struct · line 308

Quoted 2 lines
drivers/staging/ralink-gdma/ralink-gdma.c +2 -0
+                ctrl0 = GDMA_REG_CTRL0_SRC_ADDR_FIXED | 
+                        (chan->slave_id << 

GDMA_RT305X_CTRL0_SRC_REQ_SHIFT) |

drivers/staging/ralink-gdma/ralink-gdma.c static int rt305x_gdma_start_transfer(struct

Quoted 4 lines
drivers/staging/ralink-gdma/ralink-gdma.c +0 -0
                         (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)

drivers/staging/ralink-gdma/ralink-gdma.c static int rt305x_gdma_start_transfer(struct

Quoted 11 lines
drivers/staging/ralink-gdma/ralink-gdma.c +2 -2
                  */ 
                 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)

drivers/staging/ralink-gdma/ralink-gdma.c static int rt305x_gdma_start_transfer(struct

Quoted 11 lines
drivers/staging/ralink-gdma/ralink-gdma.c +2 -2
                 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)

drivers/staging/ralink-gdma/ralink-gdma.c static int rt305x_gdma_start_transfer(struct gdma_dmaengine_chan *chan)

Quoted 4 lines
drivers/staging/ralink-gdma/ralink-gdma.c +0 -1
 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, " \

drivers/staging/ralink-gdma/ralink-gdma.c static int rt305x_gdma_start_transfer(struct · line 344

Quoted 2 lines
drivers/staging/ralink-gdma/ralink-gdma.c +1 -1
-                        "ctr1 %08x, unmask %08x, done %08x, " \ 
+        dev_dbg(dma_dev->ddev.dev, "chan %d, src %08x, dst %08x, ctr0 

%08x, "

drivers/staging/ralink-gdma/ralink-gdma.c static int rt3883_gdma_start_transfer(struct

Quoted 5 lines
drivers/staging/ralink-gdma/ralink-gdma.c +1 -0
+                        "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)

drivers/staging/ralink-gdma/ralink-gdma.c static int rt3883_gdma_start_transfer(struct

Quoted 9 lines
drivers/staging/ralink-gdma/ralink-gdma.c +1 -1
         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)

drivers/staging/ralink-gdma/ralink-gdma.c static int rt3883_gdma_start_transfer(struct gdma_dmaengine_chan *chan)

Quoted 6 lines
drivers/staging/ralink-gdma/ralink-gdma.c +1 -1
                 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);

drivers/staging/ralink-gdma/ralink-gdma.c static int rt3883_gdma_start_transfer(struct gdma_dmaengine_chan *chan)

Quoted 5 lines
drivers/staging/ralink-gdma/ralink-gdma.c +0 -1
         } 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) | \

drivers/staging/ralink-gdma/ralink-gdma.c static int rt3883_gdma_start_transfer(struct · line 386

Quoted 2 lines
drivers/staging/ralink-gdma/ralink-gdma.c +1 -1
-                        (32 << GDMA_REG_CTRL1_DST_REQ_SHIFT) | \ 
+                ctrl1 = (chan->slave_id << 

GDMA_REG_CTRL1_SRC_REQ_SHIFT) |

drivers/staging/ralink-gdma/ralink-gdma.c static int rt3883_gdma_start_transfer(struct

Quoted 14 lines
drivers/staging/ralink-gdma/ralink-gdma.c +3 -2
+                        (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)

Quoted 11 lines
drivers/staging/ralink-gdma/ralink-gdma.c +2 -2
                 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; 
 

drivers/staging/ralink-gdma/ralink-gdma.c static void gdma_dma_tasklet(unsigned long arg) · line 744

Quoted 4 lines
drivers/staging/ralink-gdma/ralink-gdma.c +0 -1
@@ -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);

Quoted 7 lines
drivers/staging/ralink-gdma/ralink-gdma.c +3 -0
+                                dev_dbg(dma_dev->ddev.dev, 
+                                        "chan %d no desc to issue\n", 
+                                        chan->id); 
                         } 
                         if (!dma_dev->chan_issued) 
                                 break; 

drivers/staging/ralink-gdma/ralink-gdma.c static void gdma_dma_tasklet(unsigned long arg) · line 761

Quoted 8 lines
drivers/staging/ralink-gdma/ralink-gdma.c +1 -1
@@ -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);

drivers/staging/ralink-gdma/ralink-gdma.c static void rt305x_gdma_init(struct gdma_dma_dev

Quoted 1 line
drivers/staging/ralink-gdma/ralink-gdma.c +0 -0
@@ -767,7 +769,7 @@ static void rt305x_gdma_init(struct gdma_dma_dev 

*dma_dev)

drivers/staging/ralink-gdma/ralink-gdma.c static int gdma_dma_probe(struct platform_device

Quoted 9 lines
drivers/staging/ralink-gdma/ralink-gdma.c +1 -1
 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)

drivers/staging/ralink-gdma/ralink-gdma.c static int gdma_dma_probe(struct platform_device *pdev)

Quoted 8 lines
drivers/staging/ralink-gdma/ralink-gdma.c +1 -1
         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),

Quoted 5 lines
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/20190305103753.GA15177%40pthm.

Quoted 2 lines

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

#3 lore raw
Quoted 5 lines

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