From: Joe Perches <joe@perches.com>
Date: Tue, 5 May 2015 17:06:04 +0000 (-0700)
Subject: arcnet: Make a char * array const char * const
X-Git-Tag: firefly_0821_release~176^2~818^2~291^2~14
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=4e299b922c44d242ac855805aee94d938b06944f;p=firefly-linux-kernel-4.4.55.git

arcnet: Make a char * array const char * const

Might as well be specific about the use of this array.

Add a commment questioning the indexing too.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
---

diff --git a/drivers/net/arcnet/com20020.c b/drivers/net/arcnet/com20020.c
index f46e22093c54..ddd64bb87b58 100644
--- a/drivers/net/arcnet/com20020.c
+++ b/drivers/net/arcnet/com20020.c
@@ -42,10 +42,10 @@
 #include "arcdevice.h"
 #include "com20020.h"
 
-static char *clockrates[] = {
-	"XXXXXXX", "XXXXXXXX", "XXXXXX",
-	"2.5 Mb/s", "1.25Mb/s", "625 Kb/s", "312.5 Kb/s",
-	"156.25 Kb/s", "Reserved", "Reserved", "Reserved"
+static const char * const clockrates[] = {
+	"XXXXXXX", "XXXXXXXX", "XXXXXX", "2.5 Mb/s",
+	"1.25Mb/s", "625 Kb/s", "312.5 Kb/s", "156.25 Kb/s",
+	"Reserved", "Reserved", "Reserved"
 };
 
 static void com20020_command(struct net_device *dev, int command);
@@ -234,7 +234,12 @@ int com20020_found(struct net_device *dev, int shared)
 
 	arc_printk(D_NORMAL, dev, "Using CKP %d - data rate %s\n",
 		   lp->setup >> 1,
-		   clockrates[3 - ((lp->setup2 & 0xF0) >> 4) + ((lp->setup & 0x0F) >> 1)]);
+		   clockrates[3 -
+			      ((lp->setup2 & 0xF0) >> 4) +
+			      ((lp->setup & 0x0F) >> 1)]);
+			/* The clockrates array index looks very fragile.
+			 * It seems like it could have negative indexing.
+			 */
 
 	if (register_netdev(dev)) {
 		free_irq(dev->irq, dev);