Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 10 insertions, 8 deletions

diff --git a/drivers/net/eth16i.c b/drivers/net/eth16i.c
index 10e39f2b31c3..12d28e9d0cb7 100644
--- a/drivers/net/eth16i.c
+++ b/drivers/net/eth16i.c
@@ -13,7 +13,7 @@
    This driver supports following cards :
         - ICL EtherTeam 16i
         - ICL EtherTeam 32 EISA
-          (Uses true 32 bit transfers rather than 16i compability mode)
+          (Uses true 32 bit transfers rather than 16i compatibility mode)
 
    Example Module usage:
         insmod eth16i.o io=0x2a0 mediatype=bnc
@@ -637,7 +637,9 @@ static void eth16i_initialize(struct net_device *dev, int boot)
 
         /* Set interface port type */
         if(boot) {
-                char *porttype[] = {"BNC", "DIX", "TP", "AUTO", "FROM_EPROM" };
+                static const char * const porttype[] = {
+                        "BNC", "DIX", "TP", "AUTO", "FROM_EPROM"
+                };
 
                 switch(dev->if_port)
                 {
@@ -794,7 +796,7 @@ static int eth16i_receive_probe_packet(int ioaddr)
 
                         if(eth16i_debug > 1)
                                 printk(KERN_DEBUG "RECEIVE_PACKET\n");
-                        return(0); /* Found receive packet */
+                        return 0; /* Found receive packet */
                 }
         }
 
@@ -803,7 +805,7 @@ static int eth16i_receive_probe_packet(int ioaddr)
                 printk(KERN_DEBUG "RX_STATUS_REG = %x\n", inb(ioaddr + RX_STATUS_REG));
         }
 
-        return(0); /* Return success */
+        return 0; /* Return success */
 }
 
 #if 0
@@ -839,7 +841,7 @@ static int __init eth16i_get_irq(int ioaddr)
 
         if( ioaddr < 0x1000) {
                 cbyte = inb(ioaddr + JUMPERLESS_CONFIG);
-                return( eth16i_irqmap[ ((cbyte & 0xC0) >> 6) ] );
+                return eth16i_irqmap[((cbyte & 0xC0) >> 6)];
         } else {  /* Oh..the card is EISA so method getting IRQ different */
                 unsigned short index = 0;
                 cbyte = inb(ioaddr + EISA_IRQ_REG);
@@ -847,7 +849,7 @@ static int __init eth16i_get_irq(int ioaddr)
                         cbyte = cbyte >> 1;
                         index++;
                 }
-                return( eth32i_irqmap[ index ] );
+                return eth32i_irqmap[index];
         }
 }
 
@@ -907,7 +909,7 @@ static int eth16i_read_eeprom(int ioaddr, int offset)
         data = eth16i_read_eeprom_word(ioaddr);
         outb(CS_0 | SK_0, ioaddr + EEPROM_CTRL_REG);
 
-        return(data);
+        return data;
 }
 
 static int eth16i_read_eeprom_word(int ioaddr)
@@ -926,7 +928,7 @@ static int eth16i_read_eeprom_word(int ioaddr)
                 eeprom_slow_io();
         }
 
-        return(data);
+        return data;
 }
 
 static void eth16i_eeprom_cmd(int ioaddr, unsigned char command)