Browse Source

dmaengine: ioatdma: loop for number elements in array chanerr_str

Just iterate over the number of elements in array chanerr_str rather
than for all 32 bits.  This removes the need for a NULL chanerr_str[i]
check which could possibly overrun if the upper bits (28..31) of
chanerr are set and 27th bit in chanerr is zero. This simplifies the
code by removing an if statement and a break.

Signed-off-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Colin Ian King 8 years ago
parent
commit
1b7794163a
1 changed files with 3 additions and 7 deletions
  1. 3 7
      drivers/dma/ioat/dma.c

+ 3 - 7
drivers/dma/ioat/dma.c

@@ -66,7 +66,6 @@ static char *chanerr_str[] = {
 	"Result Guard Tag verification Error",
 	"Result Guard Tag verification Error",
 	"Result Application Tag verification Error",
 	"Result Application Tag verification Error",
 	"Result Reference Tag verification Error",
 	"Result Reference Tag verification Error",
-	NULL
 };
 };
 
 
 static void ioat_eh(struct ioatdma_chan *ioat_chan);
 static void ioat_eh(struct ioatdma_chan *ioat_chan);
@@ -75,13 +74,10 @@ static void ioat_print_chanerrs(struct ioatdma_chan *ioat_chan, u32 chanerr)
 {
 {
 	int i;
 	int i;
 
 
-	for (i = 0; i < 32; i++) {
+	for (i = 0; i < ARRAY_SIZE(chanerr_str); i++) {
 		if ((chanerr >> i) & 1) {
 		if ((chanerr >> i) & 1) {
-			if (chanerr_str[i]) {
-				dev_err(to_dev(ioat_chan), "Err(%d): %s\n",
-					i, chanerr_str[i]);
-			} else
-				break;
+			dev_err(to_dev(ioat_chan), "Err(%d): %s\n",
+				i, chanerr_str[i]);
 		}
 		}
 	}
 	}
 }
 }