17 files changed, 55 insertions, 49 deletions

diff --git a/drivers/atm/adummy.c b/drivers/atm/adummy.c
index 5effec6f5458..6d44f07b69f8 100644
--- a/drivers/atm/adummy.c
+++ b/drivers/atm/adummy.c
@@ -13,6 +13,7 @@
 #include <linux/mm.h>
 #include <linux/timer.h>
 #include <linux/interrupt.h>
+#include <linux/slab.h>
 #include <asm/io.h>
 #include <asm/byteorder.h>
 #include <asm/uaccess.h>
diff --git a/drivers/atm/ambassador.c b/drivers/atm/ambassador.c
index 66e181345b3a..9d18644c897e 100644
--- a/drivers/atm/ambassador.c
+++ b/drivers/atm/ambassador.c
@@ -36,6 +36,7 @@
 #include <linux/mutex.h>
 #include <linux/firmware.h>
 #include <linux/ihex.h>
+#include <linux/slab.h>
 
 #include <asm/atomic.h>
 #include <asm/io.h>
@@ -2351,6 +2352,7 @@ static void __init amb_check_args (void) {
 MODULE_AUTHOR(maintainer_string);
 MODULE_DESCRIPTION(description_string);
 MODULE_LICENSE("GPL");
+MODULE_FIRMWARE("atmsar11.fw");
 module_param(debug,   ushort, 0644);
 module_param(cmds,    uint, 0);
 module_param(txs,     uint, 0);
diff --git a/drivers/atm/atmtcp.c b/drivers/atm/atmtcp.c
index 02ad83d6b562..b86712167eb8 100644
--- a/drivers/atm/atmtcp.c
+++ b/drivers/atm/atmtcp.c
@@ -9,6 +9,7 @@
 #include <linux/atm_tcp.h>
 #include <linux/bitops.h>
 #include <linux/init.h>
+#include <linux/slab.h>
 #include <asm/uaccess.h>
 #include <asm/atomic.h>
 
diff --git a/drivers/atm/eni.c b/drivers/atm/eni.c
index 0c3026145443..719ec5a0dca5 100644
--- a/drivers/atm/eni.c
+++ b/drivers/atm/eni.c
@@ -18,6 +18,7 @@
 #include <linux/init.h>
 #include <linux/atm_eni.h>
 #include <linux/bitops.h>
+#include <linux/slab.h>
 #include <asm/system.h>
 #include <asm/io.h>
 #include <asm/atomic.h>
diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c
index cd5049af47a9..6e600afd06ae 100644
--- a/drivers/atm/firestream.c
+++ b/drivers/atm/firestream.c
@@ -46,6 +46,7 @@
 #include <linux/init.h>
 #include <linux/capability.h>
 #include <linux/bitops.h>
+#include <linux/slab.h>
 #include <asm/byteorder.h>
 #include <asm/system.h>
 #include <asm/string.h>
diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c
index f766cc46b4c4..f7d6ebaa0418 100644
--- a/drivers/atm/fore200e.c
+++ b/drivers/atm/fore200e.c
@@ -2064,12 +2064,10 @@ fore200e_get_esi(struct fore200e* fore200e)
         return -EBUSY;
     }
         
-    printk(FORE200E "device %s, rev. %c, S/N: %d, ESI: %02x:%02x:%02x:%02x:%02x:%02x\n", 
+    printk(FORE200E "device %s, rev. %c, S/N: %d, ESI: %pM\n",
            fore200e->name, 
            (prom->hw_revision & 0xFF) + '@',    /* probably meaningless with SBA boards */
-           prom->serial_number & 0xFFFF,
-           prom->mac_addr[ 2 ], prom->mac_addr[ 3 ], prom->mac_addr[ 4 ],
-           prom->mac_addr[ 5 ], prom->mac_addr[ 6 ], prom->mac_addr[ 7 ]);
+           prom->serial_number & 0xFFFF, &prom->mac_addr[2]);
         
     for (i = 0; i < ESI_LEN; i++) {
         fore200e->esi[ i ] = fore200e->atm_dev->esi[ i ] = prom->mac_addr[ i + 2 ];
@@ -2845,13 +2843,12 @@ fore200e_proc_read(struct atm_dev *dev, loff_t* pos, char* page)
                 "   interrupt line:\t\t%s\n"
                 "   physical base address:\t0x%p\n"
                 "   virtual base address:\t0x%p\n"
-                "   factory address (ESI):\t%02x:%02x:%02x:%02x:%02x:%02x\n"
+                "   factory address (ESI):\t%pM\n"
                 "   board serial number:\t\t%d\n\n",
                 fore200e_irq_itoa(fore200e->irq),
                 (void*)fore200e->phys_base,
                 fore200e->virt_base,
-                fore200e->esi[0], fore200e->esi[1], fore200e->esi[2],
-                fore200e->esi[3], fore200e->esi[4], fore200e->esi[5],
+                fore200e->esi,
                 fore200e->esi[4] * 256 + fore200e->esi[5]);
 
         return len;
@@ -2906,8 +2903,8 @@ fore200e_proc_read(struct atm_dev *dev, loff_t* pos, char* page)
         u32 media_index    = FORE200E_MEDIA_INDEX(fore200e->bus->read(&fore200e->cp_queues->media_type));
         u32 oc3_index;
 
-        if ((media_index < 0) || (media_index > 4))
-            media_index = 5;
+        if (media_index > 4)
+                media_index = 5;
         
         switch (fore200e->loop_mode) {
             case ATM_LM_NONE:    oc3_index = 0;
diff --git a/drivers/atm/he.c b/drivers/atm/he.c
index 70667033a568..c213e0da0343 100644
--- a/drivers/atm/he.c
+++ b/drivers/atm/he.c
@@ -67,6 +67,7 @@
 #include <linux/timer.h>
 #include <linux/interrupt.h>
 #include <linux/dma-mapping.h>
+#include <linux/slab.h>
 #include <asm/io.h>
 #include <asm/byteorder.h>
 #include <asm/uaccess.h>
@@ -2505,7 +2506,7 @@ he_close(struct atm_vcc *vcc)
                  * TBRQ, the host issues the close command to the adapter.
                  */
 
-                while (((tx_inuse = atomic_read(&sk_atm(vcc)->sk_wmem_alloc)) > 0) &&
+                while (((tx_inuse = atomic_read(&sk_atm(vcc)->sk_wmem_alloc)) > 1) &&
                        (retry < MAX_RETRY)) {
                         msleep(sleep);
                         if (sleep < 250)
@@ -2514,7 +2515,7 @@ he_close(struct atm_vcc *vcc)
                         ++retry;
                 }
 
-                if (tx_inuse)
+                if (tx_inuse > 1)
                         hprintk("close tx cid 0x%x tx_inuse = %d\n", cid, tx_inuse);
 
                 /* 2.3.1.1 generic close operations with flush */
@@ -2739,7 +2740,7 @@ he_ioctl(struct atm_dev *atm_dev, unsigned int cmd, void __user *arg)
                         spin_lock_irqsave(&he_dev->global_lock, flags);
                         switch (reg.type) {
                                 case HE_REGTYPE_PCI:
-                                        if (reg.addr < 0 || reg.addr >= HE_REGMAP_SIZE) {
+                                        if (reg.addr >= HE_REGMAP_SIZE) {
                                                 err = -EINVAL;
                                                 break;
                                         }
diff --git a/drivers/atm/horizon.c b/drivers/atm/horizon.c
index 4e49021e67ee..54720baa7363 100644
--- a/drivers/atm/horizon.c
+++ b/drivers/atm/horizon.c
@@ -40,6 +40,7 @@
 #include <linux/init.h>
 #include <linux/ioport.h>
 #include <linux/wait.h>
+#include <linux/slab.h>
 
 #include <asm/system.h>
 #include <asm/io.h>
diff --git a/drivers/atm/idt77105.c b/drivers/atm/idt77105.c
index 84672dc57f7a..dab5cf5274fb 100644
--- a/drivers/atm/idt77105.c
+++ b/drivers/atm/idt77105.c
@@ -15,6 +15,7 @@
 #include <linux/capability.h>
 #include <linux/atm_idt77105.h>
 #include <linux/spinlock.h>
+#include <linux/slab.h>
 #include <asm/system.h>
 #include <asm/param.h>
 #include <asm/uaccess.h>
diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c
index e33ae0025b12..98657a6a330d 100644
--- a/drivers/atm/idt77252.c
+++ b/drivers/atm/idt77252.c
@@ -41,6 +41,7 @@
 #include <linux/wait.h>
 #include <linux/jiffies.h>
 #include <linux/mutex.h>
+#include <linux/slab.h>
 
 #include <asm/io.h>
 #include <asm/uaccess.h>
@@ -3557,10 +3558,7 @@ init_card(struct atm_dev *dev)
         if (tmp) {
                 memcpy(card->atmdev->esi, tmp->dev_addr, 6);
 
-                printk("%s: ESI %02x:%02x:%02x:%02x:%02x:%02x\n",
-                       card->name, card->atmdev->esi[0], card->atmdev->esi[1],
-                       card->atmdev->esi[2], card->atmdev->esi[3],
-                       card->atmdev->esi[4], card->atmdev->esi[5]);
+                printk("%s: ESI %pM\n", card->name, card->atmdev->esi);
         }
         /*
          * XXX: </hack>
diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c
index b2c1b37ab2e4..ee9ddeb53417 100644
--- a/drivers/atm/iphase.c
+++ b/drivers/atm/iphase.c
@@ -54,6 +54,7 @@
 #include <linux/uio.h>  
 #include <linux/init.h>  
 #include <linux/wait.h>
+#include <linux/slab.h>
 #include <asm/system.h>  
 #include <asm/io.h>  
 #include <asm/atomic.h>  
@@ -557,7 +558,7 @@ static int ia_cbr_setup (IADEV *dev, struct atm_vcc *vcc) {
           memcpy((caddr_t)&cbrVC,(caddr_t)TstSchedTbl,sizeof(cbrVC));
        } /* while */
        // Move this VCI number into this location of the CBR Sched table.
-       memcpy((caddr_t)TstSchedTbl, (caddr_t)&vcIndex,sizeof(TstSchedTbl));
+       memcpy((caddr_t)TstSchedTbl, (caddr_t)&vcIndex, sizeof(*TstSchedTbl));
        dev->CbrRemEntries--;
        toBeAssigned--;
    } /* while */ 
@@ -1132,7 +1133,7 @@ static int rx_pkt(struct atm_dev *dev)
                     IF_ERR(printk(" cause: packet time out\n");)
                 }
                 else {
-                    IF_ERR(printk(" cause: buffer over flow\n");)
+                    IF_ERR(printk(" cause: buffer overflow\n");)
                 }
                 goto out_free_desc;
         }  
diff --git a/drivers/atm/lanai.c b/drivers/atm/lanai.c
index cf97c34cbaf1..cbe15a86c669 100644
--- a/drivers/atm/lanai.c
+++ b/drivers/atm/lanai.c
@@ -55,6 +55,7 @@
  */
 
 #include <linux/module.h>
+#include <linux/slab.h>
 #include <linux/mm.h>
 #include <linux/atmdev.h>
 #include <asm/io.h>
@@ -306,11 +307,10 @@ static void vci_bitfield_iterate(struct lanai_dev *lanai,
         const unsigned long *lp,
         void (*func)(struct lanai_dev *,vci_t vci))
 {
-        vci_t vci = find_first_bit(lp, NUM_VCI);
-        while (vci < NUM_VCI) {
+        vci_t vci;
+
+        for_each_set_bit(vci, lp, NUM_VCI)
                 func(lanai, vci);
-                vci = find_next_bit(lp, NUM_VCI, vci + 1);
-        }
 }
 
 /* -------------------- BUFFER  UTILITIES: */
@@ -998,9 +998,7 @@ static int __devinit eeprom_validate(struct lanai_dev *lanai)
                             (unsigned int) e[EEPROM_MAC_REV + i]);
                         return -EIO;
                 }
-        DPRINTK("eeprom: MAC address = %02X:%02X:%02X:%02X:%02X:%02X\n",
-                e[EEPROM_MAC + 0], e[EEPROM_MAC + 1], e[EEPROM_MAC + 2],
-                e[EEPROM_MAC + 3], e[EEPROM_MAC + 4], e[EEPROM_MAC + 5]);
+        DPRINTK("eeprom: MAC address = %pM\n", &e[EEPROM_MAC]);
         /* Verify serial number */
         lanai->serialno = eeprom_be4(lanai, EEPROM_SERIAL);
         v = eeprom_be4(lanai, EEPROM_SERIAL_REV);
@@ -2483,14 +2481,8 @@ static int lanai_proc_read(struct atm_dev *atmdev, loff_t *pos, char *page)
                 return sprintf(page, "revision: board=%d, pci_if=%d\n",
                     lanai->board_rev, (int) lanai->pci->revision);
         if (left-- == 0)
-                return sprintf(page, "EEPROM ESI: "
-                    "%02X:%02X:%02X:%02X:%02X:%02X\n",
-                    lanai->eeprom[EEPROM_MAC + 0],
-                    lanai->eeprom[EEPROM_MAC + 1],
-                    lanai->eeprom[EEPROM_MAC + 2],
-                    lanai->eeprom[EEPROM_MAC + 3],
-                    lanai->eeprom[EEPROM_MAC + 4],
-                    lanai->eeprom[EEPROM_MAC + 5]);
+                return sprintf(page, "EEPROM ESI: %pM\n",
+                    &lanai->eeprom[EEPROM_MAC]);
         if (left-- == 0)
                 return sprintf(page, "status: SOOL=%d, LOCD=%d, LED=%d, "
                     "GPIN=%d\n", (lanai->status & STATUS_SOOL) ? 1 : 0,
diff --git a/drivers/atm/nicstar.c b/drivers/atm/nicstar.c
index 3da804b1627d..b7473a6110a7 100644
--- a/drivers/atm/nicstar.c
+++ b/drivers/atm/nicstar.c
@@ -49,6 +49,7 @@
 #include <linux/timer.h>
 #include <linux/interrupt.h>
 #include <linux/bitops.h>
+#include <linux/slab.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
 #include <asm/atomic.h>
@@ -807,9 +808,7 @@ static int __devinit ns_init_card(int i, struct pci_dev *pcidev)
       }
    }
 
-   printk("nicstar%d: MAC address %02X:%02X:%02X:%02X:%02X:%02X\n", i,
-          card->atmdev->esi[0], card->atmdev->esi[1], card->atmdev->esi[2],
-          card->atmdev->esi[3], card->atmdev->esi[4], card->atmdev->esi[5]);
+   printk("nicstar%d: MAC address %pM\n", i, card->atmdev->esi);
 
    card->atmdev->dev_data = card;
    card->atmdev->ci_range.vpi_bits = card->vpibits;
diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c
index c5f5186d62a3..ded76c4c9f4f 100644
--- a/drivers/atm/solos-pci.c
+++ b/drivers/atm/solos-pci.c
@@ -40,6 +40,7 @@
 #include <linux/firmware.h>
 #include <linux/ctype.h>
 #include <linux/swab.h>
+#include <linux/slab.h>
 
 #define VERSION "0.07"
 #define PTAG "solos-pci"
@@ -142,6 +143,9 @@ MODULE_AUTHOR("Traverse Technologies <support@traverse.com.au>");
 MODULE_DESCRIPTION("Solos PCI driver");
 MODULE_VERSION(VERSION);
 MODULE_LICENSE("GPL");
+MODULE_FIRMWARE("solos-FPGA.bin");
+MODULE_FIRMWARE("solos-Firmware.bin");
+MODULE_FIRMWARE("solos-db-FPGA.bin");
 MODULE_PARM_DESC(reset, "Reset Solos chips on startup");
 MODULE_PARM_DESC(atmdebug, "Print ATM data");
 MODULE_PARM_DESC(firmware_upgrade, "Initiate Solos firmware upgrade");
@@ -528,34 +532,37 @@ static int flash_upgrade(struct solos_card *card, int chip)
         int numblocks = 0;
         int offset;
 
-        if (chip == 0) {
+        switch (chip) {
+        case 0:
                 fw_name = "solos-FPGA.bin";
                 blocksize = FPGA_BLOCK;
-        } 
-        
-        if (chip == 1) {
+                break;
+        case 1:
                 fw_name = "solos-Firmware.bin";
                 blocksize = SOLOS_BLOCK;
-        }
-        
-        if (chip == 2){
+                break;
+        case 2:
                 if (card->fpga_version > LEGACY_BUFFERS){
                         fw_name = "solos-db-FPGA.bin";
                         blocksize = FPGA_BLOCK;
                 } else {
-                        dev_info(&card->dev->dev, "FPGA version doesn't support daughter board upgrades\n");
+                        dev_info(&card->dev->dev, "FPGA version doesn't support"
+                                        " daughter board upgrades\n");
                         return -EPERM;
                 }
-        }
-        
-        if (chip == 3){
+                break;
+        case 3:
                 if (card->fpga_version > LEGACY_BUFFERS){
                         fw_name = "solos-Firmware.bin";
                         blocksize = SOLOS_BLOCK;
                 } else {
-                dev_info(&card->dev->dev, "FPGA version doesn't support daughter board upgrades\n");
-                return -EPERM;
+                        dev_info(&card->dev->dev, "FPGA version doesn't support"
+                                        " daughter board upgrades\n");
+                        return -EPERM;
                 }
+                break;
+        default:
+                return -ENODEV;
         }
 
         if (request_firmware(&fw, fw_name, &card->dev->dev))
diff --git a/drivers/atm/suni.c b/drivers/atm/suni.c
index 6dd3f5919968..da4b91ffa53e 100644
--- a/drivers/atm/suni.c
+++ b/drivers/atm/suni.c
@@ -21,6 +21,7 @@
 #include <linux/init.h>
 #include <linux/capability.h>
 #include <linux/atm_suni.h>
+#include <linux/slab.h>
 #include <asm/system.h>
 #include <asm/param.h>
 #include <asm/uaccess.h>
diff --git a/drivers/atm/uPD98402.c b/drivers/atm/uPD98402.c
index fc8cb07c2477..c45ae0573bbd 100644
--- a/drivers/atm/uPD98402.c
+++ b/drivers/atm/uPD98402.c
@@ -9,6 +9,7 @@
 #include <linux/atmdev.h>
 #include <linux/sonet.h>
 #include <linux/init.h>
+#include <linux/slab.h>
 #include <asm/uaccess.h>
 #include <asm/atomic.h>
 
diff --git a/drivers/atm/zatm.c b/drivers/atm/zatm.c
index 2e9635be048c..702accec89e9 100644
--- a/drivers/atm/zatm.c
+++ b/drivers/atm/zatm.c
@@ -21,6 +21,7 @@
 #include <linux/capability.h>
 #include <linux/bitops.h>
 #include <linux/wait.h>
+#include <linux/slab.h>
 #include <asm/byteorder.h>
 #include <asm/system.h>
 #include <asm/string.h>