drivers/net/e2100.c: fix sparse warning: symbol shadows an earlier one
authorHannes Eder <hannes@hanneseder.net>
Sat, 14 Feb 2009 11:12:10 +0000 (11:12 +0000)
committerDavid S. Miller <davem@davemloft.net>
Wed, 18 Feb 2009 01:21:08 +0000 (17:21 -0800)
Impact: Remove redundant inner scope variable and while being at it
make use of ARRAY_SIZE instead of a hardcoded number.

Fix this sparse warning:
  drivers/net/e2100.c:219:56: warning: symbol 'i' shadows an earlier one
  drivers/net/e2100.c:181:13: originally declared here

Signed-off-by: Hannes Eder <hannes@hanneseder.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/e2100.c

index b07ba1924de0b907ef5bdd6c298d5a83edd8b375..d2f6ee1a62904626cff295f57a6932e345b709af 100644 (file)
@@ -216,13 +216,13 @@ static int __init e21_probe1(struct net_device *dev, int ioaddr)
                printk(" %02X", station_addr[i]);
 
        if (dev->irq < 2) {
-               int irqlist[] = {15,11,10,12,5,9,3,4}, i;
-               for (i = 0; i < 8; i++)
+               int irqlist[] = {15, 11, 10, 12, 5, 9, 3, 4};
+               for (i = 0; i < ARRAY_SIZE(irqlist); i++)
                        if (request_irq (irqlist[i], NULL, 0, "bogus", NULL) != -EBUSY) {
                                dev->irq = irqlist[i];
                                break;
                        }
-               if (i >= 8) {
+               if (i >= ARRAY_SIZE(irqlist)) {
                        printk(" unable to get IRQ %d.\n", dev->irq);
                        retval = -EAGAIN;
                        goto out;