11 files changed, 143 insertions, 119 deletions

diff --git a/drivers/net/wireless/orinoco/airport.c b/drivers/net/wireless/orinoco/airport.c
index 28f1cae48439..5582dca9f7f5 100644
--- a/drivers/net/wireless/orinoco/airport.c
+++ b/drivers/net/wireless/orinoco/airport.c
@@ -4,9 +4,9 @@
  * card.
  *
  * Copyright notice & release notes in file orinoco.c
- * 
+ *
  * Note specific to airport stub:
- * 
+ *
  *  0.05 : first version of the new split driver
  *  0.06 : fix possible hang on powerup, add sleep support
  */
@@ -60,7 +60,8 @@ airport_suspend(struct macio_dev *mdev, pm_message_t state)
         orinoco_unlock(priv, &flags);
 
         disable_irq(dev->irq);
-        pmac_call_feature(PMAC_FTR_AIRPORT_ENABLE, macio_get_of_node(mdev), 0, 0);
+        pmac_call_feature(PMAC_FTR_AIRPORT_ENABLE,
+                          macio_get_of_node(mdev), 0, 0);
 
         return 0;
 }
@@ -75,7 +76,8 @@ airport_resume(struct macio_dev *mdev)
 
         printk(KERN_DEBUG "%s: Airport waking up\n", dev->name);
 
-        pmac_call_feature(PMAC_FTR_AIRPORT_ENABLE, macio_get_of_node(mdev), 0, 1);
+        pmac_call_feature(PMAC_FTR_AIRPORT_ENABLE,
+                          macio_get_of_node(mdev), 0, 1);
         msleep(200);
 
         enable_irq(dev->irq);
@@ -93,7 +95,7 @@ airport_resume(struct macio_dev *mdev)
 
         priv->hw_unavailable--;
 
-        if (priv->open && (! priv->hw_unavailable)) {
+        if (priv->open && (!priv->hw_unavailable)) {
                 err = __orinoco_up(dev);
                 if (err)
                         printk(KERN_ERR "%s: Error %d restarting card on PBOOK_WAKE\n",
@@ -127,7 +129,8 @@ airport_detach(struct macio_dev *mdev)
 
         macio_release_resource(mdev, 0);
 
-        pmac_call_feature(PMAC_FTR_AIRPORT_ENABLE, macio_get_of_node(mdev), 0, 0);
+        pmac_call_feature(PMAC_FTR_AIRPORT_ENABLE,
+                          macio_get_of_node(mdev), 0, 0);
         ssleep(1);
 
         macio_set_drvdata(mdev, NULL);
@@ -153,9 +156,11 @@ static int airport_hard_reset(struct orinoco_private *priv)
          * off. */
         disable_irq(dev->irq);
 
-        pmac_call_feature(PMAC_FTR_AIRPORT_ENABLE, macio_get_of_node(card->mdev), 0, 0);
+        pmac_call_feature(PMAC_FTR_AIRPORT_ENABLE,
+                          macio_get_of_node(card->mdev), 0, 0);
         ssleep(1);
-        pmac_call_feature(PMAC_FTR_AIRPORT_ENABLE, macio_get_of_node(card->mdev), 0, 1);
+        pmac_call_feature(PMAC_FTR_AIRPORT_ENABLE,
+                          macio_get_of_node(card->mdev), 0, 1);
         ssleep(1);
 
         enable_irq(dev->irq);
@@ -182,7 +187,7 @@ airport_attach(struct macio_dev *mdev, const struct of_device_id *match)
         /* Allocate space for private device-specific data */
         dev = alloc_orinocodev(sizeof(*card), &mdev->ofdev.dev,
                                airport_hard_reset, NULL);
-        if (! dev) {
+        if (!dev) {
                 printk(KERN_ERR PFX "Cannot allocate network device\n");
                 return -ENODEV;
         }
@@ -214,9 +219,10 @@ airport_attach(struct macio_dev *mdev, const struct of_device_id *match)
         }
 
         hermes_struct_init(hw, card->vaddr, HERMES_16BIT_REGSPACING);
-                
+
         /* Power up card */
-        pmac_call_feature(PMAC_FTR_AIRPORT_ENABLE, macio_get_of_node(mdev), 0, 1);
+        pmac_call_feature(PMAC_FTR_AIRPORT_ENABLE,
+                          macio_get_of_node(mdev), 0, 1);
         ssleep(1);
 
         /* Reset it before we get the interrupt */
@@ -248,7 +254,7 @@ MODULE_AUTHOR("Benjamin Herrenschmidt <benh@kernel.crashing.org>");
 MODULE_DESCRIPTION("Driver for the Apple Airport wireless card.");
 MODULE_LICENSE("Dual MPL/GPL");
 
-static struct of_device_id airport_match[] = 
+static struct of_device_id airport_match[] =
 {
         {
         .name           = "radio",
@@ -256,10 +262,9 @@ static struct of_device_id airport_match[] =
         {},
 };
 
-MODULE_DEVICE_TABLE (of, airport_match);
+MODULE_DEVICE_TABLE(of, airport_match);
 
-static struct macio_driver airport_driver = 
-{
+static struct macio_driver airport_driver = {
         .name           = DRIVER_NAME,
         .match_table    = airport_match,
         .probe          = airport_attach,
diff --git a/drivers/net/wireless/orinoco/hermes.c b/drivers/net/wireless/orinoco/hermes.c
index bfa375369df3..f48358fed9f7 100644
--- a/drivers/net/wireless/orinoco/hermes.c
+++ b/drivers/net/wireless/orinoco/hermes.c
@@ -15,7 +15,7 @@
  *
  * Copyright (C) 2000, David Gibson, Linuxcare Australia.
  * (C) Copyright David Gibson, IBM Corp. 2001-2003.
- * 
+ *
  * The contents of this file are subject to the Mozilla Public License
  * Version 1.1 (the "License"); you may not use this file except in
  * compliance with the License. You may obtain a copy of the License
@@ -45,7 +45,8 @@
 
 #include "hermes.h"
 
-MODULE_DESCRIPTION("Low-level driver helper for Lucent Hermes chipset and Prism II HFA384x wireless MAC controller");
+MODULE_DESCRIPTION("Low-level driver helper for Lucent Hermes chipset"
+                   " and Prism II HFA384x wireless MAC controller");
 MODULE_AUTHOR("Pavel Roskin <proski@gnu.org>"
         " & David Gibson <hermes@gibson.dropbear.id.au>");
 MODULE_LICENSE("Dual MPL/GPL");
@@ -61,13 +62,13 @@ MODULE_LICENSE("Dual MPL/GPL");
  */
 
 #define DMSG(stuff...) do {printk(KERN_DEBUG "hermes @ %p: " , hw->iobase); \
-                        printk(stuff);} while (0)
+                        printk(stuff); } while (0)
 
 #undef HERMES_DEBUG
 #ifdef HERMES_DEBUG
 #include <stdarg.h>
 
-#define DEBUG(lvl, stuff...) if ( (lvl) <= HERMES_DEBUG) DMSG(stuff)
+#define DEBUG(lvl, stuff...) if ((lvl) <= HERMES_DEBUG) DMSG(stuff)
 
 #else /* ! HERMES_DEBUG */
 
@@ -95,20 +96,19 @@ static int hermes_issue_cmd(hermes_t *hw, u16 cmd, u16 param0,
 
         /* First wait for the command register to unbusy */
         reg = hermes_read_regn(hw, CMD);
-        while ( (reg & HERMES_CMD_BUSY) && k ) {
+        while ((reg & HERMES_CMD_BUSY) && k) {
                 k--;
                 udelay(1);
                 reg = hermes_read_regn(hw, CMD);
         }
-        if (reg & HERMES_CMD_BUSY) {
+        if (reg & HERMES_CMD_BUSY)
                 return -EBUSY;
-        }
 
         hermes_write_regn(hw, PARAM2, param2);
         hermes_write_regn(hw, PARAM1, param1);
         hermes_write_regn(hw, PARAM0, param0);
         hermes_write_regn(hw, CMD, cmd);
-        
+
         return 0;
 }
 
@@ -191,23 +191,23 @@ int hermes_init(hermes_t *hw)
         hermes_write_regn(hw, EVACK, 0xffff);
 
         /* Normally it's a "can't happen" for the command register to
-           be busy when we go to issue a command because we are
-           serializing all commands.  However we want to have some
-           chance of resetting the card even if it gets into a stupid
-           state, so we actually wait to see if the command register
-           will unbusy itself here. */
+           be busy when we go to issue a command because we are
+           serializing all commands.  However we want to have some
+           chance of resetting the card even if it gets into a stupid
+           state, so we actually wait to see if the command register
+           will unbusy itself here. */
         k = CMD_BUSY_TIMEOUT;
         reg = hermes_read_regn(hw, CMD);
         while (k && (reg & HERMES_CMD_BUSY)) {
-                if (reg == 0xffff) /* Special case - the card has probably been removed,
-                                      so don't wait for the timeout */
+                if (reg == 0xffff) /* Special case - the card has probably been
+                                      removed, so don't wait for the timeout */
                         return -ENODEV;
 
                 k--;
                 udelay(1);
                 reg = hermes_read_regn(hw, CMD);
         }
-        
+
         /* No need to explicitly handle the timeout - if we've timed
            out hermes_issue_cmd() will probably return -EBUSY below */
 
@@ -228,7 +228,10 @@ EXPORT_SYMBOL(hermes_init);
 /* Issue a command to the chip, and (busy!) wait for it to
  * complete.
  *
- * Returns: < 0 on internal error, 0 on success, > 0 on error returned by the firmware
+ * Returns:
+ *     < 0 on internal error
+ *       0 on success
+ *     > 0 on error returned by the firmware
  *
  * Callable from any context, but locking is your problem. */
 int hermes_docmd_wait(hermes_t *hw, u16 cmd, u16 parm0,
@@ -241,13 +244,13 @@ int hermes_docmd_wait(hermes_t *hw, u16 cmd, u16 parm0,
 
         err = hermes_issue_cmd(hw, cmd, parm0, 0, 0);
         if (err) {
-                if (! hermes_present(hw)) {
+                if (!hermes_present(hw)) {
                         if (net_ratelimit())
                                 printk(KERN_WARNING "hermes @ %p: "
                                        "Card removed while issuing command "
                                        "0x%04x.\n", hw->iobase, cmd);
                         err = -ENODEV;
-                } else 
+                } else
                         if (net_ratelimit())
                                 printk(KERN_ERR "hermes @ %p: "
                                        "Error %d issuing command 0x%04x.\n",
@@ -257,21 +260,21 @@ int hermes_docmd_wait(hermes_t *hw, u16 cmd, u16 parm0,
 
         reg = hermes_read_regn(hw, EVSTAT);
         k = CMD_COMPL_TIMEOUT;
-        while ( (! (reg & HERMES_EV_CMD)) && k) {
+        while ((!(reg & HERMES_EV_CMD)) && k) {
                 k--;
                 udelay(10);
                 reg = hermes_read_regn(hw, EVSTAT);
         }
 
-        if (! hermes_present(hw)) {
+        if (!hermes_present(hw)) {
                 printk(KERN_WARNING "hermes @ %p: Card removed "
                        "while waiting for command 0x%04x completion.\n",
                        hw->iobase, cmd);
                 err = -ENODEV;
                 goto out;
         }
-                
-        if (! (reg & HERMES_EV_CMD)) {
+
+        if (!(reg & HERMES_EV_CMD)) {
                 printk(KERN_ERR "hermes @ %p: Timeout waiting for "
                        "command 0x%04x completion.\n", hw->iobase, cmd);
                 err = -ETIMEDOUT;
@@ -301,31 +304,30 @@ int hermes_allocate(hermes_t *hw, u16 size, u16 *fid)
         int err = 0;
         int k;
         u16 reg;
-        
-        if ( (size < HERMES_ALLOC_LEN_MIN) || (size > HERMES_ALLOC_LEN_MAX) )
+
+        if ((size < HERMES_ALLOC_LEN_MIN) || (size > HERMES_ALLOC_LEN_MAX))
                 return -EINVAL;
 
         err = hermes_docmd_wait(hw, HERMES_CMD_ALLOC, size, NULL);
-        if (err) {
+        if (err)
                 return err;
-        }
 
         reg = hermes_read_regn(hw, EVSTAT);
         k = ALLOC_COMPL_TIMEOUT;
-        while ( (! (reg & HERMES_EV_ALLOC)) && k) {
+        while ((!(reg & HERMES_EV_ALLOC)) && k) {
                 k--;
                 udelay(10);
                 reg = hermes_read_regn(hw, EVSTAT);
         }
-        
-        if (! hermes_present(hw)) {
+
+        if (!hermes_present(hw)) {
                 printk(KERN_WARNING "hermes @ %p: "
                        "Card removed waiting for frame allocation.\n",
                        hw->iobase);
                 return -ENODEV;
         }
-                
-        if (! (reg & HERMES_EV_ALLOC)) {
+
+        if (!(reg & HERMES_EV_ALLOC)) {
                 printk(KERN_ERR "hermes @ %p: "
                        "Timeout waiting for frame allocation\n",
                        hw->iobase);
@@ -334,14 +336,17 @@ int hermes_allocate(hermes_t *hw, u16 size, u16 *fid)
 
         *fid = hermes_read_regn(hw, ALLOCFID);
         hermes_write_regn(hw, EVACK, HERMES_EV_ALLOC);
-        
+
         return 0;
 }
 EXPORT_SYMBOL(hermes_allocate);
 
 /* Set up a BAP to read a particular chunk of data from card's internal buffer.
  *
- * Returns: < 0 on internal failure (errno), 0 on success, >0 on error
+ * Returns:
+ *     < 0 on internal failure (errno)
+ *       0 on success
+ *     > 0 on error
  * from firmware
  *
  * Callable from any context */
@@ -353,7 +358,7 @@ static int hermes_bap_seek(hermes_t *hw, int bap, u16 id, u16 offset)
         u16 reg;
 
         /* Paranoia.. */
-        if ( (offset > HERMES_BAP_OFFSET_MAX) || (offset % 2) )
+        if ((offset > HERMES_BAP_OFFSET_MAX) || (offset % 2))
                 return -EINVAL;
 
         k = HERMES_BAP_BUSY_TIMEOUT;
@@ -374,7 +379,7 @@ static int hermes_bap_seek(hermes_t *hw, int bap, u16 id, u16 offset)
         /* Wait for the BAP to be ready */
         k = HERMES_BAP_BUSY_TIMEOUT;
         reg = hermes_read_reg(hw, oreg);
-        while ( (reg & (HERMES_OFFSET_BUSY | HERMES_OFFSET_ERR)) && k) {
+        while ((reg & (HERMES_OFFSET_BUSY | HERMES_OFFSET_ERR)) && k) {
                 k--;
                 udelay(1);
                 reg = hermes_read_reg(hw, oreg);
@@ -386,9 +391,8 @@ static int hermes_bap_seek(hermes_t *hw, int bap, u16 id, u16 offset)
                        (reg & HERMES_OFFSET_BUSY) ? "timeout" : "error",
                        reg, id, offset);
 
-                if (reg & HERMES_OFFSET_BUSY) {
+                if (reg & HERMES_OFFSET_BUSY)
                         return -ETIMEDOUT;
-                }
 
                 return -EIO;            /* error or wrong offset */
         }
@@ -400,7 +404,10 @@ static int hermes_bap_seek(hermes_t *hw, int bap, u16 id, u16 offset)
  * BAP. Synchronization/serialization is the caller's problem.  len
  * must be even.
  *
- * Returns: < 0 on internal failure (errno), 0 on success, > 0 on error from firmware
+ * Returns:
+ *     < 0 on internal failure (errno)
+ *       0 on success
+ *     > 0 on error from firmware
  */
 int hermes_bap_pread(hermes_t *hw, int bap, void *buf, int len,
                      u16 id, u16 offset)
@@ -408,7 +415,7 @@ int hermes_bap_pread(hermes_t *hw, int bap, void *buf, int len,
         int dreg = bap ? HERMES_DATA1 : HERMES_DATA0;
         int err = 0;
 
-        if ( (len < 0) || (len % 2) )
+        if ((len < 0) || (len % 2))
                 return -EINVAL;
 
         err = hermes_bap_seek(hw, bap, id, offset);
@@ -426,7 +433,10 @@ EXPORT_SYMBOL(hermes_bap_pread);
 /* Write a block of data to the chip's buffer, via the
  * BAP. Synchronization/serialization is the caller's problem.
  *
- * Returns: < 0 on internal failure (errno), 0 on success, > 0 on error from firmware
+ * Returns:
+ *     < 0 on internal failure (errno)
+ *       0 on success
+ *     > 0 on error from firmware
  */
 int hermes_bap_pwrite(hermes_t *hw, int bap, const void *buf, int len,
                       u16 id, u16 offset)
@@ -440,11 +450,11 @@ int hermes_bap_pwrite(hermes_t *hw, int bap, const void *buf, int len,
         err = hermes_bap_seek(hw, bap, id, offset);
         if (err)
                 goto out;
-        
+
         /* Actually do the transfer */
         hermes_write_bytes(hw, dreg, buf, len);
 
- out:   
+ out:
         return err;
 }
 EXPORT_SYMBOL(hermes_bap_pwrite);
@@ -465,7 +475,7 @@ int hermes_read_ltv(hermes_t *hw, int bap, u16 rid, unsigned bufsize,
         u16 rlength, rtype;
         unsigned nwords;
 
-        if ( (bufsize < 0) || (bufsize % 2) )
+        if ((bufsize < 0) || (bufsize % 2))
                 return -EINVAL;
 
         err = hermes_docmd_wait(hw, HERMES_CMD_ACCESS, rid, NULL);
@@ -478,7 +488,7 @@ int hermes_read_ltv(hermes_t *hw, int bap, u16 rid, unsigned bufsize,
 
         rlength = hermes_read_reg(hw, dreg);
 
-        if (! rlength)
+        if (!rlength)
                 return -ENODATA;
 
         rtype = hermes_read_reg(hw, dreg);
@@ -503,7 +513,7 @@ int hermes_read_ltv(hermes_t *hw, int bap, u16 rid, unsigned bufsize,
 }
 EXPORT_SYMBOL(hermes_read_ltv);
 
-int hermes_write_ltv(hermes_t *hw, int bap, u16 rid, 
+int hermes_write_ltv(hermes_t *hw, int bap, u16 rid,
                      u16 length, const void *value)
 {
         int dreg = bap ? HERMES_DATA1 : HERMES_DATA0;
diff --git a/drivers/net/wireless/orinoco/hermes.h b/drivers/net/wireless/orinoco/hermes.h
index 8b13c8fef3dc..c78c442a02c8 100644
--- a/drivers/net/wireless/orinoco/hermes.h
+++ b/drivers/net/wireless/orinoco/hermes.h
@@ -15,7 +15,8 @@
  * Copyright (C) 2000, David Gibson, Linuxcare Australia.
  * (C) Copyright David Gibson, IBM Corp. 2001-2003.
  *
- * Portions taken from hfa384x.h, Copyright (C) 1999 AbsoluteValue Systems, Inc. All Rights Reserved.
+ * Portions taken from hfa384x.h.
+ * Copyright (C) 1999 AbsoluteValue Systems, Inc. All Rights Reserved.
  *
  * This file distributed under the GPL, version 2.
  */
@@ -31,7 +32,7 @@
 */
 
 #include <linux/if_ether.h>
-#include <asm/io.h>
+#include <linux/io.h>
 
 /*
  * Limits and constants
@@ -203,7 +204,7 @@ struct hermes_tx_descriptor {
         __le32 sw_support;
         u8 retry_count;
         u8 tx_rate;
-        __le16 tx_control;      
+        __le16 tx_control;
 } __attribute__ ((packed));
 
 #define HERMES_TXSTAT_RETRYERR          (0x0001)
@@ -298,7 +299,7 @@ struct symbol_scan_apinfo {
         /* bits: 0-ess, 1-ibss, 4-privacy [wep] */
         __le16 essid_len;       /* ESSID length */
         u8 essid[32];           /* ESSID of the network */
-        __le16 rates[5];        /* Bit rate supported */
+        __le16 rates[5];        /* Bit rate supported */
         __le16 basic_rates;     /* Basic rates bitmask */
         u8 unknown2[6];         /* Always FF:FF:FF:FF:00:00 */
         u8 unknown3[8];         /* Always 0, appeared in f/w 3.91-68 */
@@ -344,14 +345,14 @@ struct agere_ext_scan_info {
         u8      data[316];
 } __attribute__ ((packed));
 
-#define HERMES_LINKSTATUS_NOT_CONNECTED   (0x0000)  
+#define HERMES_LINKSTATUS_NOT_CONNECTED   (0x0000)
 #define HERMES_LINKSTATUS_CONNECTED       (0x0001)
 #define HERMES_LINKSTATUS_DISCONNECTED    (0x0002)
 #define HERMES_LINKSTATUS_AP_CHANGE       (0x0003)
 #define HERMES_LINKSTATUS_AP_OUT_OF_RANGE (0x0004)
 #define HERMES_LINKSTATUS_AP_IN_RANGE     (0x0005)
 #define HERMES_LINKSTATUS_ASSOC_FAILED    (0x0006)
-  
+
 struct hermes_linkstatus {
         __le16 linkstatus;         /* Link status */
 } __attribute__ ((packed));
@@ -384,11 +385,12 @@ typedef struct hermes {
 
 /* Register access convenience macros */
 #define hermes_read_reg(hw, off) \
-        (ioread16((hw)->iobase + ( (off) << (hw)->reg_spacing )))
+        (ioread16((hw)->iobase + ((off) << (hw)->reg_spacing)))
 #define hermes_write_reg(hw, off, val) \
         (iowrite16((val), (hw)->iobase + ((off) << (hw)->reg_spacing)))
 #define hermes_read_regn(hw, name) hermes_read_reg((hw), HERMES_##name)
-#define hermes_write_regn(hw, name, val) hermes_write_reg((hw), HERMES_##name, (val))
+#define hermes_write_regn(hw, name, val) \
+        hermes_write_reg((hw), HERMES_##name, (val))
 
 /* Function prototypes */
 void hermes_struct_init(hermes_t *hw, void __iomem *address, int reg_spacing);
@@ -430,7 +432,7 @@ static inline int hermes_enable_port(hermes_t *hw, int port)
 
 static inline int hermes_disable_port(hermes_t *hw, int port)
 {
-        return hermes_docmd_wait(hw, HERMES_CMD_DISABLE | (port << 8), 
+        return hermes_docmd_wait(hw, HERMES_CMD_DISABLE | (port << 8),
                                  0, NULL);
 }
 
@@ -441,11 +443,12 @@ static inline int hermes_inquire(hermes_t *hw, u16 rid)
         return hermes_docmd_wait(hw, HERMES_CMD_INQUIRE, rid, NULL);
 }
 
-#define HERMES_BYTES_TO_RECLEN(n) ( (((n)+1)/2) + 1 )
-#define HERMES_RECLEN_TO_BYTES(n) ( ((n)-1) * 2 )
+#define HERMES_BYTES_TO_RECLEN(n) ((((n)+1)/2) + 1)
+#define HERMES_RECLEN_TO_BYTES(n) (((n)-1) * 2)
 
 /* Note that for the next two, the count is in 16-bit words, not bytes */
-static inline void hermes_read_words(struct hermes *hw, int off, void *buf, unsigned count)
+static inline void hermes_read_words(struct hermes *hw, int off,
+                                     void *buf, unsigned count)
 {
         off = off << hw->reg_spacing;
         ioread16_rep(hw->iobase + off, buf, count);
@@ -460,7 +463,8 @@ static inline void hermes_write_bytes(struct hermes *hw, int off,
                 iowrite8(buf[count - 1], hw->iobase + off);
 }
 
-static inline void hermes_clear_words(struct hermes *hw, int off, unsigned count)
+static inline void hermes_clear_words(struct hermes *hw, int off,
+                                      unsigned count)
 {
         unsigned i;
 
@@ -471,9 +475,10 @@ static inline void hermes_clear_words(struct hermes *hw, int off, unsigned count
 }
 
 #define HERMES_READ_RECORD(hw, bap, rid, buf) \
-        (hermes_read_ltv((hw),(bap),(rid), sizeof(*buf), NULL, (buf)))
+        (hermes_read_ltv((hw), (bap), (rid), sizeof(*buf), NULL, (buf)))
 #define HERMES_WRITE_RECORD(hw, bap, rid, buf) \
-        (hermes_write_ltv((hw),(bap),(rid),HERMES_BYTES_TO_RECLEN(sizeof(*buf)),(buf)))
+        (hermes_write_ltv((hw), (bap), (rid), \
+                          HERMES_BYTES_TO_RECLEN(sizeof(*buf)), (buf)))
 
 static inline int hermes_read_wordrec(hermes_t *hw, int bap, u16 rid, u16 *word)
 {
diff --git a/drivers/net/wireless/orinoco/orinoco.h b/drivers/net/wireless/orinoco/orinoco.h
index c653816ef5fe..f3f94b28ce6d 100644
--- a/drivers/net/wireless/orinoco/orinoco.h
+++ b/drivers/net/wireless/orinoco/orinoco.h
@@ -1,5 +1,5 @@
 /* orinoco.h
- * 
+ *
  * Common definitions to all pieces of the various orinoco
  * drivers
  */
@@ -18,9 +18,9 @@
 #include "hermes.h"
 
 /* To enable debug messages */
-//#define ORINOCO_DEBUG         3
+/*#define ORINOCO_DEBUG         3*/
 
-#define WIRELESS_SPY            // enable iwspy support
+#define WIRELESS_SPY            /* enable iwspy support */
 
 #define MAX_SCAN_LEN            4096
 
@@ -121,7 +121,7 @@ struct orinoco_private {
         u16 encode_alg, wep_restrict, tx_key;
         struct orinoco_key keys[ORINOCO_MAX_KEYS];
         int bitratemode;
-        char nick[IW_ESSID_MAX_SIZE+1];
+        char nick[IW_ESSID_MAX_SIZE+1];
         char desired_essid[IW_ESSID_MAX_SIZE+1];
         char desired_bssid[ETH_ALEN];
         int bssid_fixed;
@@ -131,7 +131,7 @@ struct orinoco_private {
         u16 pm_on, pm_mcast, pm_period, pm_timeout;
         u16 preamble;
 #ifdef WIRELESS_SPY
-        struct iw_spy_data spy_data; /* iwspy support */
+        struct iw_spy_data spy_data; /* iwspy support */
         struct iw_public_data   wireless_data;
 #endif
 
@@ -168,7 +168,10 @@ struct orinoco_private {
 
 #ifdef ORINOCO_DEBUG
 extern int orinoco_debug;
-#define DEBUG(n, args...) do { if (orinoco_debug>(n)) printk(KERN_DEBUG args); } while(0)
+#define DEBUG(n, args...) do { \
+        if (orinoco_debug > (n)) \
+                printk(KERN_DEBUG args); \
+} while (0)
 #else
 #define DEBUG(n, args...) do { } while (0)
 #endif  /* ORINOCO_DEBUG */
@@ -185,7 +188,7 @@ extern void free_orinocodev(struct net_device *dev);
 extern int __orinoco_up(struct net_device *dev);
 extern int __orinoco_down(struct net_device *dev);
 extern int orinoco_reinit_firmware(struct net_device *dev);
-extern irqreturn_t orinoco_interrupt(int irq, void * dev_id);
+extern irqreturn_t orinoco_interrupt(int irq, void *dev_id);
 
 /********************************************************************/
 /* Locking and synchronization functions                            */
diff --git a/drivers/net/wireless/orinoco/orinoco_cs.c b/drivers/net/wireless/orinoco/orinoco_cs.c
index 0b32215d3f5d..d194b3e0311d 100644
--- a/drivers/net/wireless/orinoco/orinoco_cs.c
+++ b/drivers/net/wireless/orinoco/orinoco_cs.c
@@ -6,7 +6,7 @@
  * It should also be usable on various Prism II based cards such as the
  * Linksys, D-Link and Farallon Skyline. It should also work on Symbol
  * cards such as the 3Com AirConnect and Ericsson WLAN.
- * 
+ *
  * Copyright notice & release notes in file orinoco.c
  */
 
@@ -30,7 +30,8 @@
 /********************************************************************/
 
 MODULE_AUTHOR("David Gibson <hermes@gibson.dropbear.id.au>");
-MODULE_DESCRIPTION("Driver for PCMCIA Lucent Orinoco, Prism II based and similar wireless cards");
+MODULE_DESCRIPTION("Driver for PCMCIA Lucent Orinoco,"
+                   " Prism II based and similar wireless cards");
 MODULE_LICENSE("Dual MPL/GPL");
 
 /* Module parameters */
@@ -53,8 +54,8 @@ struct orinoco_pccard {
 
         /* Used to handle hard reset */
         /* yuck, we need this hack to work around the insanity of the
-         * PCMCIA layer */
-        unsigned long hard_reset_in_progress; 
+         * PCMCIA layer */
+        unsigned long hard_reset_in_progress;
 };
 
 
@@ -98,7 +99,7 @@ orinoco_cs_hard_reset(struct orinoco_private *priv)
  * This creates an "instance" of the driver, allocating local data
  * structures for one device.  The device is registered with Card
  * Services.
- * 
+ *
  * The dev_link structure is initialized, but we don't actually
  * configure the card at this point -- we wait until we receive a card
  * insertion event.  */
@@ -111,7 +112,7 @@ orinoco_cs_probe(struct pcmcia_device *link)
 
         dev = alloc_orinocodev(sizeof(*card), &handle_to_dev(link),
                                orinoco_cs_hard_reset, NULL);
-        if (! dev)
+        if (!dev)
                 return -ENOMEM;
         priv = netdev_priv(dev);
         card = priv->card;
@@ -124,7 +125,7 @@ orinoco_cs_probe(struct pcmcia_device *link)
         link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_HANDLE_PRESENT;
         link->irq.IRQInfo1 = IRQ_LEVEL_ID;
         link->irq.Handler = orinoco_interrupt;
-        link->irq.Instance = dev; 
+        link->irq.Instance = dev;
 
         /* General socket configuration defaults can go here.  In this
          * client, we assume very little, and rely on the CIS for
@@ -162,8 +163,10 @@ static void orinoco_cs_detach(struct pcmcia_device *link)
  */
 
 #define CS_CHECK(fn, ret) do { \
-                last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; \
-        } while (0)
+        last_fn = (fn); \
+        if ((last_ret = (ret)) != 0) \
+                goto cs_failed; \
+} while (0)
 
 static int orinoco_cs_config_check(struct pcmcia_device *p_dev,
                                    cistpl_cftable_entry_t *cfg,
@@ -307,8 +310,8 @@ orinoco_cs_config(struct pcmcia_device *link)
          * initialized and arranged in a linked list at link->dev_node. */
         strcpy(card->node.dev_name, dev->name);
         link->dev_node = &card->node; /* link->dev_node being non-NULL is also
-                                    used to indicate that the
-                                    net_device has been registered */
+                                       * used to indicate that the
+                                       * net_device has been registered */
 
         /* Finally, report what we've done */
         printk(KERN_DEBUG "%s: " DRIVER_NAME " at %s, irq %d, io "
@@ -359,7 +362,7 @@ static int orinoco_cs_suspend(struct pcmcia_device *link)
         /* This is probably racy, but I can't think of
            a better way, short of rewriting the PCMCIA
            layer to not suck :-( */
-        if (! test_bit(0, &card->hard_reset_in_progress)) {
+        if (!test_bit(0, &card->hard_reset_in_progress)) {
                 spin_lock_irqsave(&priv->lock, flags);
 
                 err = __orinoco_down(dev);
@@ -384,7 +387,7 @@ static int orinoco_cs_resume(struct pcmcia_device *link)
         int err = 0;
         unsigned long flags;
 
-        if (! test_bit(0, &card->hard_reset_in_progress)) {
+        if (!test_bit(0, &card->hard_reset_in_progress)) {
                 err = orinoco_reinit_firmware(dev);
                 if (err) {
                         printk(KERN_ERR "%s: Error %d re-initializing firmware\n",
@@ -397,7 +400,7 @@ static int orinoco_cs_resume(struct pcmcia_device *link)
                 netif_device_attach(dev);
                 priv->hw_unavailable--;
 
-                if (priv->open && ! priv->hw_unavailable) {
+                if (priv->open && !priv->hw_unavailable) {
                         err = __orinoco_up(dev);
                         if (err)
                                 printk(KERN_ERR "%s: Error %d restarting card\n",
diff --git a/drivers/net/wireless/orinoco/orinoco_nortel.c b/drivers/net/wireless/orinoco/orinoco_nortel.c
index 2fc86596302e..b01726255c6f 100644
--- a/drivers/net/wireless/orinoco/orinoco_nortel.c
+++ b/drivers/net/wireless/orinoco/orinoco_nortel.c
@@ -9,12 +9,12 @@
  *
  * Some of this code is borrowed from orinoco_plx.c
  *      Copyright (C) 2001 Daniel Barlow
- * Some of this code is borrowed from orinoco_pci.c 
+ * Some of this code is borrowed from orinoco_pci.c
  *  Copyright (C) 2001 Jean Tourrilhes
  * Some of this code is "inspired" by linux-wlan-ng-0.1.10, but nothing
  * has been copied from it. linux-wlan-ng-0.1.10 is originally :
  *      Copyright (C) 1999 AbsoluteValue Systems, Inc.  All Rights Reserved.
- * 
+ *
  * The contents of this file are subject to the Mozilla Public License
  * Version 1.1 (the "License"); you may not use this file except in
  * compliance with the License. You may obtain a copy of the License
@@ -103,9 +103,8 @@ static int orinoco_nortel_hw_init(struct orinoco_pci_card *card)
         iowrite16(0x8, card->bridge_io + 2);
         for (i = 0; i < 30; i++) {
                 mdelay(30);
-                if (ioread16(card->bridge_io) & 0x10) {
+                if (ioread16(card->bridge_io) & 0x10)
                         break;
-                }
         }
         if (i == 30) {
                 printk(KERN_ERR PFX "brg1 timed out\n");
diff --git a/drivers/net/wireless/orinoco/orinoco_pci.c b/drivers/net/wireless/orinoco/orinoco_pci.c
index 4ebd638a073e..78cafff1fb2e 100644
--- a/drivers/net/wireless/orinoco/orinoco_pci.c
+++ b/drivers/net/wireless/orinoco/orinoco_pci.c
@@ -1,5 +1,5 @@
 /* orinoco_pci.c
- * 
+ *
  * Driver for Prism 2.5/3 devices that have a direct PCI interface
  * (i.e. these are not PCMCIA cards in a PCMCIA-to-PCI bridge).
  * The card contains only one PCI region, which contains all the usual
@@ -237,7 +237,8 @@ static char version[] __initdata = DRIVER_NAME " " DRIVER_VERSION
         " (Pavel Roskin <proski@gnu.org>,"
         " David Gibson <hermes@gibson.dropbear.id.au> &"
         " Jean Tourrilhes <jt@hpl.hp.com>)";
-MODULE_AUTHOR("Pavel Roskin <proski@gnu.org> & David Gibson <hermes@gibson.dropbear.id.au>");
+MODULE_AUTHOR("Pavel Roskin <proski@gnu.org> &"
+              " David Gibson <hermes@gibson.dropbear.id.au>");
 MODULE_DESCRIPTION("Driver for wireless LAN cards using direct PCI interface");
 MODULE_LICENSE("Dual MPL/GPL");
 
diff --git a/drivers/net/wireless/orinoco/orinoco_pci.h b/drivers/net/wireless/orinoco/orinoco_pci.h
index f4e5e06760c1..88df3ee98078 100644
--- a/drivers/net/wireless/orinoco/orinoco_pci.h
+++ b/drivers/net/wireless/orinoco/orinoco_pci.h
@@ -1,5 +1,5 @@
 /* orinoco_pci.h
- * 
+ *
  * Common code for all Orinoco drivers for PCI devices, including
  * both native PCI and PCMCIA-to-PCI bridges.
  *
@@ -37,11 +37,11 @@ static int orinoco_pci_suspend(struct pci_dev *pdev, pm_message_t state)
         if (err)
                 printk(KERN_WARNING "%s: error %d bringing interface down "
                        "for suspend\n", dev->name, err);
-        
+
         netif_device_detach(dev);
 
         priv->hw_unavailable++;
-        
+
         orinoco_unlock(priv, &flags);
 
         free_irq(pdev->irq, dev);
@@ -90,13 +90,13 @@ static int orinoco_pci_resume(struct pci_dev *pdev)
 
         priv->hw_unavailable--;
 
-        if (priv->open && (! priv->hw_unavailable)) {
+        if (priv->open && (!priv->hw_unavailable)) {
                 err = __orinoco_up(dev);
                 if (err)
                         printk(KERN_ERR "%s: Error %d restarting card on resume\n",
                                dev->name, err);
         }
-        
+
         spin_unlock_irqrestore(&priv->lock, flags);
 
         return 0;
diff --git a/drivers/net/wireless/orinoco/orinoco_plx.c b/drivers/net/wireless/orinoco/orinoco_plx.c
index ef761857bb38..a2a4471c0337 100644
--- a/drivers/net/wireless/orinoco/orinoco_plx.c
+++ b/drivers/net/wireless/orinoco/orinoco_plx.c
@@ -146,9 +146,8 @@ static int orinoco_plx_hw_init(struct orinoco_pci_card *card)
         };
 
         printk(KERN_DEBUG PFX "CIS: ");
-        for (i = 0; i < 16; i++) {
+        for (i = 0; i < 16; i++)
                 printk("%02X:", ioread8(card->attr_io + (i << 1)));
-        }
         printk("\n");
 
         /* Verify whether a supported PC card is present */
diff --git a/drivers/net/wireless/orinoco/orinoco_tmd.c b/drivers/net/wireless/orinoco/orinoco_tmd.c
index ede24ec309c0..e77c4042d43a 100644
--- a/drivers/net/wireless/orinoco/orinoco_tmd.c
+++ b/drivers/net/wireless/orinoco/orinoco_tmd.c
@@ -1,7 +1,7 @@
 /* orinoco_tmd.c
  *
  * Driver for Prism II devices which would usually be driven by orinoco_cs,
- * but are connected to the PCI bus by a TMD7160. 
+ * but are connected to the PCI bus by a TMD7160.
  *
  * Copyright (C) 2003 Joerg Dorchain <joerg AT dorchain.net>
  * based heavily upon orinoco_plx.c Copyright (C) 2001 Daniel Barlow
diff --git a/drivers/net/wireless/orinoco/spectrum_cs.c b/drivers/net/wireless/orinoco/spectrum_cs.c
index b2ca2e39c2cb..9aefe19dbac2 100644
--- a/drivers/net/wireless/orinoco/spectrum_cs.c
+++ b/drivers/net/wireless/orinoco/spectrum_cs.c
@@ -133,7 +133,7 @@ spectrum_reset(struct pcmcia_device *link, int idle)
         udelay(1000);
         return 0;
 
-      cs_failed:
+cs_failed:
         cs_error(link, last_fn, last_ret);
         return -ENODEV;
 }
@@ -171,7 +171,7 @@ spectrum_cs_stop_firmware(struct orinoco_private *priv, int idle)
  * This creates an "instance" of the driver, allocating local data
  * structures for one device.  The device is registered with Card
  * Services.
- * 
+ *
  * The dev_link structure is initialized, but we don't actually
  * configure the card at this point -- we wait until we receive a card
  * insertion event.  */
@@ -185,7 +185,7 @@ spectrum_cs_probe(struct pcmcia_device *link)
         dev = alloc_orinocodev(sizeof(*card), &handle_to_dev(link),
                                spectrum_cs_hard_reset,
                                spectrum_cs_stop_firmware);
-        if (! dev)
+        if (!dev)
                 return -ENOMEM;
         priv = netdev_priv(dev);
         card = priv->card;
@@ -198,7 +198,7 @@ spectrum_cs_probe(struct pcmcia_device *link)
         link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_HANDLE_PRESENT;
         link->irq.IRQInfo1 = IRQ_LEVEL_ID;
         link->irq.Handler = orinoco_interrupt;
-        link->irq.Instance = dev; 
+        link->irq.Instance = dev;
 
         /* General socket configuration defaults can go here.  In this
          * client, we assume very little, and rely on the CIS for
@@ -367,9 +367,8 @@ spectrum_cs_config(struct pcmcia_device *link)
         card->node.major = card->node.minor = 0;
 
         /* Reset card */
-        if (spectrum_cs_hard_reset(priv) != 0) {
+        if (spectrum_cs_hard_reset(priv) != 0)
                 goto failed;
-        }
 
         SET_NETDEV_DEV(dev, &handle_to_dev(link));
         /* Tell the stack we exist */
@@ -382,8 +381,8 @@ spectrum_cs_config(struct pcmcia_device *link)
          * initialized and arranged in a linked list at link->dev_node. */
         strcpy(card->node.dev_name, dev->name);
         link->dev_node = &card->node; /* link->dev_node being non-NULL is also
-                                    used to indicate that the
-                                    net_device has been registered */
+                                       * used to indicate that the
+                                       * net_device has been registered */
 
         /* Finally, report what we've done */
         printk(KERN_DEBUG "%s: " DRIVER_NAME " at %s, irq %d, io "