16 files changed, 149 insertions, 123 deletions

diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c
index 79653e868c12..aca96747e5e2 100644
--- a/drivers/staging/comedi/comedi_fops.c
+++ b/drivers/staging/comedi/comedi_fops.c
@@ -63,7 +63,7 @@ module_param(comedi_debug, int, 0644);
 int comedi_autoconfig = 1;
 module_param(comedi_autoconfig, bool, 0444);
 
-int comedi_num_legacy_minors = 0;
+int comedi_num_legacy_minors;
 module_param(comedi_num_legacy_minors, int, 0444);
 
 static DEFINE_SPINLOCK(comedi_file_info_table_lock);
@@ -1510,7 +1510,7 @@ static unsigned int comedi_poll(struct file *file, poll_table * wait)
 }
 
 static ssize_t comedi_write(struct file *file, const char *buf, size_t nbytes,
-                            loff_t * offset)
+                                loff_t *offset)
 {
         struct comedi_subdevice *s;
         struct comedi_async *async;
@@ -1612,7 +1612,7 @@ done:
 }
 
 static ssize_t comedi_read(struct file *file, char *buf, size_t nbytes,
-                           loff_t * offset)
+                                loff_t *offset)
 {
         struct comedi_subdevice *s;
         struct comedi_async *async;
diff --git a/drivers/staging/comedi/drivers/ni_660x.c b/drivers/staging/comedi/drivers/ni_660x.c
index f74fc5e6ba20..017630fb2424 100644
--- a/drivers/staging/comedi/drivers/ni_660x.c
+++ b/drivers/staging/comedi/drivers/ni_660x.c
@@ -54,7 +54,6 @@ enum ni_660x_constants {
 #define NUM_PFI_CHANNELS 40
 /* really there are only up to 3 dma channels, but the register layout allows
 for 4 */
-
 #define MAX_DMA_CHANNEL 4
 
 /* See Register-Level Programmer Manual page 3.1 */
@@ -200,7 +199,7 @@ struct NI_660xRegisterData {
         const char *name;       /*  Register Name */
         int offset;             /*  Offset from base address from GPCT chip */
         enum ni_660x_register_direction direction;
-        enum ni_660x_register_width size; /*  1 byte, 2 bytes, or 4 bytes */
+        enum ni_660x_register_width size; /* 1 byte, 2 bytes, or 4 bytes */
 };
 
 static const struct NI_660xRegisterData registerData[NumRegisters] = {
@@ -1082,13 +1081,12 @@ static int ni_660x_attach(struct comedi_device *dev,
         output enables in stc dio control reg */
         ni_660x_write_register(dev, 0, 0, STCDIOControl);
 
-        private(dev)->counter_dev
-                = ni_gpct_device_construct(dev,
-                                           &ni_gpct_write_register,
-                                           &ni_gpct_read_register,
-                                           ni_gpct_variant_660x,
-                                           ni_660x_num_counters
-                                           (dev));
+        private(dev)->counter_dev = ni_gpct_device_construct(dev,
+                                                     &ni_gpct_write_register,
+                                                     &ni_gpct_read_register,
+                                                     ni_gpct_variant_660x,
+                                                     ni_660x_num_counters
+                                                     (dev));
         if (private(dev)->counter_dev == NULL)
                 return -ENOMEM;
         for (i = 0; i < NI_660X_MAX_NUM_COUNTERS; ++i) {
diff --git a/drivers/staging/comedi/drivers/ni_labpc.c b/drivers/staging/comedi/drivers/ni_labpc.c
index bc5662e2a9bf..3c88caaa9dab 100644
--- a/drivers/staging/comedi/drivers/ni_labpc.c
+++ b/drivers/staging/comedi/drivers/ni_labpc.c
@@ -628,9 +628,11 @@ int labpc_common_attach(struct comedi_device *dev, unsigned long iobase,
         /* analog output */
         s = dev->subdevices + 1;
         if (thisboard->has_ao) {
-                /* Could provide command support, except it only has a
+                /*
+                 * Could provide command support, except it only has a
                  * one sample hardware buffer for analog output and no
-                 * underrun flag. */
+                 * underrun flag.
+                 */
                 s->type = COMEDI_SUBD_AO;
                 s->subdev_flags = SDF_READABLE | SDF_WRITABLE | SDF_GROUND;
                 s->n_chan = NUM_AO_CHAN;
@@ -1149,6 +1151,7 @@ static int labpc_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
         /*  initialize software conversion count */
         if (cmd->stop_src == TRIG_COUNT)
                 devpriv->count = cmd->stop_arg * cmd->chanlist_len;
+
         /*  setup hardware conversion counter */
         if (cmd->stop_src == TRIG_EXT) {
                 /*  load counter a1 with count of 3 (pc+ manual says this is minimum allowed) using mode 0 */
@@ -1403,7 +1406,10 @@ static irqreturn_t labpc_interrupt(int irq, void *d)
         }
 
         if (devpriv->current_transfer == isa_dma_transfer) {
-        /* if a dma terminal count of external stop trigger has occurred */
+                /*
+                 * if a dma terminal count of external stop trigger
+                 * has occurred
+                 */
                 if (devpriv->status1_bits & DMATC_BIT ||
                     (thisboard->register_layout == labpc_1200_layout
                      && devpriv->status2_bits & A1_TC_BIT)) {
@@ -1523,6 +1529,7 @@ static void labpc_drain_dma(struct comedi_device *dev)
         /* write data to comedi buffer */
         for (i = 0; i < num_points; i++)
                 cfc_write_to_buffer(s, devpriv->dma_buffer[i]);
+
         if (async->cmd.stop_src == TRIG_COUNT)
                 devpriv->count -= num_points;
 
diff --git a/drivers/staging/comedi/drivers/pcmad.c b/drivers/staging/comedi/drivers/pcmad.c
index 44ed777599c4..fab8092bd7aa 100644
--- a/drivers/staging/comedi/drivers/pcmad.c
+++ b/drivers/staging/comedi/drivers/pcmad.c
@@ -34,11 +34,11 @@ Configuration options:
   [0] - I/O port base
   [1] - unused
   [2] - Analog input reference
-          0 = single ended
-          1 = differential
+        0 = single ended
+        1 = differential
   [3] - Analog input encoding (must match jumpers)
-          0 = straight binary
-          1 = two's complement
+        0 = straight binary
+        1 = two's complement
 */
 
 #include <linux/interrupt.h>
@@ -134,7 +134,7 @@ static int pcmad_attach(struct comedi_device *dev, struct comedi_devconfig *it)
         unsigned long iobase;
 
         iobase = it->options[0];
-        printk(KERN_NOTICE "comedi%d: pcmad: 0x%04lx ", dev->minor, iobase);
+        printk(KERN_INFO "comedi%d: pcmad: 0x%04lx ", dev->minor, iobase);
         if (!request_region(iobase, PCMAD_SIZE, "pcmad")) {
                 printk(KERN_CONT "I/O port conflict\n");
                 return -EIO;
@@ -166,10 +166,11 @@ static int pcmad_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 
 static int pcmad_detach(struct comedi_device *dev)
 {
-        printk(KERN_NOTICE "comedi%d: pcmad: remove\n", dev->minor);
+        printk(KERN_INFO "comedi%d: pcmad: remove\n", dev->minor);
 
         if (dev->irq)
                 free_irq(dev->irq, dev);
+
         if (dev->iobase)
                 release_region(dev->iobase, PCMAD_SIZE);
 
diff --git a/drivers/staging/comedi/drivers/poc.c b/drivers/staging/comedi/drivers/poc.c
index 8990bf2fc186..1ebc356ce40e 100644
--- a/drivers/staging/comedi/drivers/poc.c
+++ b/drivers/staging/comedi/drivers/poc.c
@@ -128,15 +128,15 @@ static int poc_attach(struct comedi_device *dev, struct comedi_devconfig *it)
         dev->board_name = this_board->name;
 
         if (iobase == 0) {
-                printk(KERN_WARNING "io base address required\n");
+                printk(KERN_ERR "io base address required\n");
                 return -EINVAL;
         }
 
         iosize = this_board->iosize;
         /* check if io addresses are available */
         if (!request_region(iobase, iosize, "dac02")) {
-                printk(KERN_WARNING "I/O port conflict: failed to allocate "
-                       "ports 0x%lx to 0x%lx\n", iobase, iobase + iosize - 1);
+                printk(KERN_ERR "I/O port conflict: failed to allocate ports "
+                        "0x%lx to 0x%lx\n", iobase, iobase + iosize - 1);
                 return -EIO;
         }
         dev->iobase = iobase;
diff --git a/drivers/staging/dream/camera/msm_camera.c b/drivers/staging/dream/camera/msm_camera.c
index 06dba60dda0b..dc7c603625c7 100644
--- a/drivers/staging/dream/camera/msm_camera.c
+++ b/drivers/staging/dream/camera/msm_camera.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2008-2009 QUALCOMM Incorporated.
  */
 
-/* FIXME: most allocations need not be GFP_ATOMIC
+/* FIXME: most allocations need not be GFP_ATOMIC */
 /* FIXME: management of mutexes */
 /* FIXME: msm_pmem_region_lookup return values */
 /* FIXME: way too many copy to/from user */
@@ -1619,7 +1619,8 @@ static int msm_release_control(struct inode *node, struct file *filep)
         int rc;
         struct msm_control_device *ctrl_pmsm = filep->private_data;
         struct msm_device *pmsm = ctrl_pmsm->pmsm;
-        printk(KERN_INFO "msm_camera: RELEASE %s\n", filep->f_path.dentry->d_name.name);
+        printk(KERN_INFO "msm_camera: RELEASE %s\n",
+                                        filep->f_path.dentry->d_name.name);
         rc = __msm_release(pmsm->sync);
         if (!rc) {
                 MSM_DRAIN_QUEUE(&ctrl_pmsm->ctrl_q, ctrl_status_q);
@@ -1633,7 +1634,8 @@ static int msm_release_frame(struct inode *node, struct file *filep)
 {
         int rc;
         struct msm_device *pmsm = filep->private_data;
-        printk(KERN_INFO "msm_camera: RELEASE %s\n", filep->f_path.dentry->d_name.name);
+        printk(KERN_INFO "msm_camera: RELEASE %s\n",
+                                        filep->f_path.dentry->d_name.name);
         rc = __msm_release(pmsm->sync);
         if (!rc) {
                 MSM_DRAIN_QUEUE(pmsm->sync, prev_frame_q);
diff --git a/drivers/staging/dream/camera/s5k3e2fx.c b/drivers/staging/dream/camera/s5k3e2fx.c
index cbd432da88ee..841792e2624b 100644
--- a/drivers/staging/dream/camera/s5k3e2fx.c
+++ b/drivers/staging/dream/camera/s5k3e2fx.c
@@ -743,13 +743,11 @@ static int s5k3e2fx_sensor_open_init(const struct msm_camera_sensor_info *data)
         }
 
         /* initialize AF */
-        rc = s5k3e2fx_i2c_write_b(s5k3e2fx_client->addr,
-                        0x3146, 0x3A)
+        rc = s5k3e2fx_i2c_write_b(s5k3e2fx_client->addr, 0x3146, 0x3A);
         if (rc < 0)
                 goto init_fail1;
 
-        rc = s5k3e2fx_i2c_write_b(s5k3e2fx_client->addr,
-                        0x3130, 0x03)
+        rc = s5k3e2fx_i2c_write_b(s5k3e2fx_client->addr, 0x3130, 0x03);
         if (rc < 0)
                 goto init_fail1;
 
diff --git a/drivers/staging/wlan-ng/hfa384x.h b/drivers/staging/wlan-ng/hfa384x.h
index d93e6e90720b..1fa42e01e8cb 100644
--- a/drivers/staging/wlan-ng/hfa384x.h
+++ b/drivers/staging/wlan-ng/hfa384x.h
@@ -61,17 +61,17 @@
 #include <linux/if_ether.h>
 
 /*--- Mins & Maxs -----------------------------------*/
-#define         HFA384x_PORTID_MAX              ((u16)7)
-#define         HFA384x_NUMPORTS_MAX            ((u16)(HFA384x_PORTID_MAX+1))
-#define         HFA384x_PDR_LEN_MAX             ((u16)512)      /* in bytes, from EK */
-#define         HFA384x_PDA_RECS_MAX            ((u16)200)      /* a guess */
-#define         HFA384x_PDA_LEN_MAX             ((u16)1024)     /* in bytes, from EK */
-#define         HFA384x_SCANRESULT_MAX          ((u16)31)
-#define         HFA384x_HSCANRESULT_MAX         ((u16)31)
-#define         HFA384x_CHINFORESULT_MAX        ((u16)16)
-#define         HFA384x_RID_GUESSING_MAXLEN     2048    /* I'm not really sure */
-#define         HFA384x_RIDDATA_MAXLEN          HFA384x_RID_GUESSING_MAXLEN
-#define         HFA384x_USB_RWMEM_MAXLEN        2048
+#define HFA384x_PORTID_MAX              ((u16)7)
+#define HFA384x_NUMPORTS_MAX            ((u16)(HFA384x_PORTID_MAX+1))
+#define HFA384x_PDR_LEN_MAX             ((u16)512) /* in bytes, from EK */
+#define HFA384x_PDA_RECS_MAX            ((u16)200) /* a guess */
+#define HFA384x_PDA_LEN_MAX             ((u16)1024) /* in bytes, from EK*/
+#define HFA384x_SCANRESULT_MAX          ((u16)31)
+#define HFA384x_HSCANRESULT_MAX         ((u16)31)
+#define HFA384x_CHINFORESULT_MAX        ((u16)16)
+#define HFA384x_RID_GUESSING_MAXLEN     2048    /* I'm not really sure */
+#define HFA384x_RIDDATA_MAXLEN          HFA384x_RID_GUESSING_MAXLEN
+#define HFA384x_USB_RWMEM_MAXLEN        2048
 
 /*--- Support Constants -----------------------------*/
 #define         HFA384x_PORTTYPE_IBSS                   ((u16)0)
@@ -135,12 +135,21 @@
 #define         HFA384x_DLSTATE_FLASHENABLED            2
 
 /*--- Register Field Masks --------------------------*/
-#define         HFA384x_CMD_AINFO               ((u16)(BIT(14) | BIT(13) | BIT(12) | BIT(11) | BIT(10) | BIT(9) | BIT(8)))
-#define         HFA384x_CMD_MACPORT             ((u16)(BIT(10) | BIT(9) | BIT(8)))
+#define         HFA384x_CMD_AINFO               ((u16)(BIT(14) | BIT(13) \
+                                                        | BIT(12) | BIT(11) \
+                                                        | BIT(10) | BIT(9) \
+                                                        | BIT(8)))
+#define         HFA384x_CMD_MACPORT             ((u16)(BIT(10) | BIT(9) | \
+                                                        BIT(8)))
 #define         HFA384x_CMD_PROGMODE            ((u16)(BIT(9) | BIT(8)))
-#define         HFA384x_CMD_CMDCODE             ((u16)(BIT(5) | BIT(4) | BIT(3) | BIT(2) | BIT(1) | BIT(0)))
+#define         HFA384x_CMD_CMDCODE             ((u16)(BIT(5) | BIT(4) | \
+                                                        BIT(3) | BIT(2) | \
+                                                        BIT(1) | BIT(0)))
 
-#define         HFA384x_STATUS_RESULT           ((u16)(BIT(14) | BIT(13) | BIT(12) | BIT(11) | BIT(10) | BIT(9) | BIT(8)))
+#define         HFA384x_STATUS_RESULT           ((u16)(BIT(14) | BIT(13) \
+                                                        | BIT(12) | BIT(11) \
+                                                        | BIT(10) | BIT(9) \
+                                                        | BIT(8)))
 
 /*--- Command Code Constants --------------------------*/
 /*--- Controller Commands --------------------------*/
@@ -244,8 +253,10 @@ Information RID Lengths:  MAC Information
   This is the length of JUST the DATA part of the RID (does not
   include the len or code fields)
 --------------------------------------------------------------------*/
-#define         HFA384x_RID_DBMCOMMSQUALITY_LEN         ((u16)sizeof(hfa384x_dbmcommsquality_t))
-#define         HFA384x_RID_JOINREQUEST_LEN             ((u16)sizeof(hfa384x_JoinRequest_data_t))
+#define         HFA384x_RID_DBMCOMMSQUALITY_LEN  \
+        ((u16) sizeof(hfa384x_dbmcommsquality_t))
+#define         HFA384x_RID_JOINREQUEST_LEN \
+        ((u16)sizeof(hfa384x_JoinRequest_data_t))
 
 /*--------------------------------------------------------------------
 Information RIDs:  Modem Information
@@ -322,9 +333,11 @@ PD Record codes
 
 /*--- Register Test/Get/Set Field macros ------------------------*/
 
-#define         HFA384x_CMD_AINFO_SET(value)            ((u16)((u16)(value) << 8))
-#define         HFA384x_CMD_MACPORT_SET(value)          ((u16)HFA384x_CMD_AINFO_SET(value))
-#define         HFA384x_CMD_PROGMODE_SET(value)         ((u16)HFA384x_CMD_AINFO_SET((u16)value))
+#define         HFA384x_CMD_AINFO_SET(value)    ((u16)((u16)(value) << 8))
+#define         HFA384x_CMD_MACPORT_SET(value)  \
+                        ((u16)HFA384x_CMD_AINFO_SET(value))
+#define         HFA384x_CMD_PROGMODE_SET(value) \
+                        ((u16)HFA384x_CMD_AINFO_SET((u16)value))
 #define         HFA384x_CMD_CMDCODE_SET(value)          ((u16)(value))
 
 #define         HFA384x_STATUS_RESULT_SET(value)        (((u16)(value)) << 8)
@@ -479,7 +492,8 @@ Communication Frames: Field Masks for Transmit Frames
 #define         HFA384x_TXSTATUS_AGEDERR                ((u16)BIT(1))
 #define         HFA384x_TXSTATUS_RETRYERR               ((u16)BIT(0))
 /*-- Transmit Control Field --*/
-#define         HFA384x_TX_MACPORT                      ((u16)(BIT(10) | BIT(9) | BIT(8)))
+#define         HFA384x_TX_MACPORT                      ((u16)(BIT(10) | \
+                                                          BIT(9) | BIT(8)))
 #define         HFA384x_TX_STRUCTYPE                    ((u16)(BIT(4) | BIT(3)))
 #define         HFA384x_TX_TXEX                         ((u16)BIT(2))
 #define         HFA384x_TX_TXOK                         ((u16)BIT(1))
@@ -496,7 +510,8 @@ Communication Frames: Test/Get/Set Field Values for Transmit Frames
 #define HFA384x_TX_SET(v, m, s)         ((((u16)(v))<<((u16)(s)))&((u16)(m)))
 
 #define HFA384x_TX_MACPORT_SET(v)       HFA384x_TX_SET(v, HFA384x_TX_MACPORT, 8)
-#define HFA384x_TX_STRUCTYPE_SET(v)     HFA384x_TX_SET(v, HFA384x_TX_STRUCTYPE, 3)
+#define HFA384x_TX_STRUCTYPE_SET(v)     HFA384x_TX_SET(v, \
+                                                HFA384x_TX_STRUCTYPE, 3)
 #define HFA384x_TX_TXEX_SET(v)          HFA384x_TX_SET(v, HFA384x_TX_TXEX, 2)
 #define HFA384x_TX_TXOK_SET(v)          HFA384x_TX_SET(v, HFA384x_TX_TXOK, 1)
 /*--------------------------------------------------------------------
@@ -534,13 +549,17 @@ Communication Frames: Field Masks for Receive Frames
 --------------------------------------------------------------------*/
 
 /*-- Status Fields --*/
-#define         HFA384x_RXSTATUS_MACPORT                ((u16)(BIT(10) | BIT(9) | BIT(8)))
+#define         HFA384x_RXSTATUS_MACPORT                ((u16)(BIT(10) | \
+                                                                BIT(9) | \
+                                                                BIT(8)))
 #define         HFA384x_RXSTATUS_FCSERR                 ((u16)BIT(0))
 /*--------------------------------------------------------------------
 Communication Frames: Test/Get/Set Field Values for Receive Frames
 --------------------------------------------------------------------*/
-#define         HFA384x_RXSTATUS_MACPORT_GET(value)     ((u16)((((u16)(value)) & HFA384x_RXSTATUS_MACPORT) >> 8))
-#define         HFA384x_RXSTATUS_ISFCSERR(value)        ((u16)(((u16)(value)) & HFA384x_RXSTATUS_FCSERR))
+#define         HFA384x_RXSTATUS_MACPORT_GET(value)     ((u16)((((u16)(value)) \
+                                            & HFA384x_RXSTATUS_MACPORT) >> 8))
+#define         HFA384x_RXSTATUS_ISFCSERR(value)        ((u16)(((u16)(value)) \
+                                                  & HFA384x_RXSTATUS_FCSERR))
 /*--------------------------------------------------------------------
  FRAME STRUCTURES: Information Types and Information Frame Structures
 ----------------------------------------------------------------------
@@ -1174,14 +1193,14 @@ typedef struct hfa484x_metacmd {
 } hfa384x_metacmd_t;
 
 #define MAX_GRP_ADDR            32
-#define WLAN_COMMENT_MAX        80      /* Max. length of user comment string. */
+#define WLAN_COMMENT_MAX        80  /* Max. length of user comment string. */
 
-#define WLAN_AUTH_MAX           60      /* Max. # of authenticated stations. */
-#define WLAN_ACCESS_MAX         60      /* Max. # of stations in an access list. */
-#define WLAN_ACCESS_NONE        0       /* No stations may be authenticated. */
-#define WLAN_ACCESS_ALL         1       /* All stations may be authenticated. */
-#define WLAN_ACCESS_ALLOW       2       /* Authenticate only "allowed" stations. */
-#define WLAN_ACCESS_DENY        3       /* Do not authenticate "denied" stations. */
+#define WLAN_AUTH_MAX           60  /* Max. # of authenticated stations. */
+#define WLAN_ACCESS_MAX         60  /* Max. # of stations in an access list. */
+#define WLAN_ACCESS_NONE        0   /* No stations may be authenticated. */
+#define WLAN_ACCESS_ALL         1   /* All stations may be authenticated. */
+#define WLAN_ACCESS_ALLOW       2   /* Authenticate only "allowed" stations. */
+#define WLAN_ACCESS_DENY        3   /* Do not authenticate "denied" stations. */
 
 /* XXX These are going away ASAP */
 typedef struct prism2sta_authlist {
@@ -1294,10 +1313,23 @@ typedef struct hfa384x {
         hfa384x_caplevel_t cap_sup_ap;
 
         /* Actor compatibility ranges */
-        hfa384x_caplevel_t cap_act_pri_cfi;     /* pri f/w to controller interface */
-        hfa384x_caplevel_t cap_act_sta_cfi;     /* sta f/w to controller interface */
+        hfa384x_caplevel_t cap_act_pri_cfi;     /*
+                                                 * pri f/w to controller
+                                                 * interface
+                                                 */
+
+        hfa384x_caplevel_t cap_act_sta_cfi;     /*
+                                                 * sta f/w to controller
+                                                 * interface
+                                                 */
+
         hfa384x_caplevel_t cap_act_sta_mfi;     /* sta f/w to modem interface */
-        hfa384x_caplevel_t cap_act_ap_cfi;      /* ap f/w to controller interface */
+
+        hfa384x_caplevel_t cap_act_ap_cfi;      /*
+                                                 * ap f/w to controller
+                                                 * interface
+                                                 */
+
         hfa384x_caplevel_t cap_act_ap_mfi;      /* ap f/w to modem interface */
 
         u32 psusercount;        /* Power save user count. */
@@ -1387,6 +1419,6 @@ int
 hfa384x_cmd_download(hfa384x_t *hw,
                      u16 mode, u16 lowaddr, u16 highaddr, u16 codelen);
 
-#endif /* __KERNEL__ */
+#endif /*__KERNEL__ */
 
-#endif /* _HFA384x_H */
+#endif /*_HFA384x_H */
diff --git a/drivers/staging/wlan-ng/hfa384x_usb.c b/drivers/staging/wlan-ng/hfa384x_usb.c
index 612995b3d576..5df56f0238d6 100644
--- a/drivers/staging/wlan-ng/hfa384x_usb.c
+++ b/drivers/staging/wlan-ng/hfa384x_usb.c
@@ -118,10 +118,10 @@
 #include <linux/wireless.h>
 #include <linux/netdevice.h>
 #include <linux/timer.h>
-#include <asm/io.h>
+#include <linux/io.h>
 #include <linux/delay.h>
 #include <asm/byteorder.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <linux/list.h>
 #include <linux/usb.h>
 #include <linux/byteorder/generic.h>
@@ -1909,22 +1909,19 @@ int hfa384x_drvr_flashdl_enable(hfa384x_t *hw)
                 return -EINVAL;
 
         /* Retrieve the buffer loc&size and timeout */
-
         result = hfa384x_drvr_getconfig(hw, HFA384x_RID_DOWNLOADBUFFER,
-                &(hw->bufinfo), sizeof(hw->bufinfo));
-        if (result) {
+                                        &(hw->bufinfo), sizeof(hw->bufinfo));
+        if (result)
                 return result;
-        }
+
         hw->bufinfo.page = le16_to_cpu(hw->bufinfo.page);
         hw->bufinfo.offset = le16_to_cpu(hw->bufinfo.offset);
         hw->bufinfo.len = le16_to_cpu(hw->bufinfo.len);
-
         result = hfa384x_drvr_getconfig16(hw, HFA384x_RID_MAXLOADTIME,
-                &(hw->dltimeout));
-
-        if (result) {
+                                          &(hw->dltimeout));
+        if (result)
                 return result;
-        }
+
         hw->dltimeout = le16_to_cpu(hw->dltimeout);
 
         pr_debug("flashdl_enable\n");
@@ -3075,9 +3072,7 @@ static void hfa384x_usbctlxq_run(hfa384x_t *hw)
                                   hfa384x_ctlxout_callback, hw);
                 hw->ctlx_urb.transfer_flags |= USB_QUEUE_BULK;
 
-                /* Now submit the URB and update the CTLX's state
-                 */
-
+                /* Now submit the URB and update the CTLX's state */
                 result = SUBMIT_URB(&hw->ctlx_urb, GFP_ATOMIC);
                 if (result == 0) {
                         /* This CTLX is now running on the active queue */
@@ -3878,9 +3873,8 @@ retry:
 delresp:
         if (delete_resptimer) {
                 timer_ok = del_timer(&hw->resptimer);
-                if (timer_ok != 0) {
+                if (timer_ok != 0)
                         hw->resp_timer_done = 1;
-                }
         }
 
         spin_unlock_irqrestore(&hw->ctlxq.lock, flags);
diff --git a/drivers/staging/wlan-ng/p80211conv.c b/drivers/staging/wlan-ng/p80211conv.c
index 99c5ec45b00d..a1605fbc8092 100644
--- a/drivers/staging/wlan-ng/p80211conv.c
+++ b/drivers/staging/wlan-ng/p80211conv.c
@@ -207,10 +207,9 @@ int skb_ether_to_p80211(wlandevice_t *wlandev, u32 ethconv,
 
                 p80211_wep->data = kmalloc(skb->len, GFP_ATOMIC);
                 foo = wep_encrypt(wlandev, skb->data, p80211_wep->data,
-                        skb->len,
-                        (wlandev->hostwep &
-                        HOSTWEP_DEFAULTKEY_MASK),
-                        p80211_wep->iv, p80211_wep->icv);
+                                  skb->len,
+                                  (wlandev->hostwep &HOSTWEP_DEFAULTKEY_MASK),
+                                  p80211_wep->iv, p80211_wep->icv);
                 if (foo) {
                         printk(KERN_WARNING
                                "Host en-WEP failed, dropping frame (%d).\n",
@@ -324,10 +323,10 @@ int skb_p80211_to_ether(wlandevice_t *wlandev, u32 ethconv,
                         return 1;
                 }
                 foo = wep_decrypt(wlandev, skb->data + payload_offset + 4,
-                        payload_length - 8, -1,
-                        skb->data + payload_offset,
-                        skb->data + payload_offset +
-                        payload_length - 4);
+                                       payload_length - 8, -1,
+                                       skb->data + payload_offset,
+                                       skb->data + payload_offset +
+                                       payload_length - 4);
                 if (foo) {
                         /* de-wep failed, drop skb. */
                         pr_debug("Host de-WEP failed, dropping frame (%d).\n",
diff --git a/drivers/staging/wlan-ng/p80211metadef.h b/drivers/staging/wlan-ng/p80211metadef.h
index 10605285cf6e..0ccfba1294de 100644
--- a/drivers/staging/wlan-ng/p80211metadef.h
+++ b/drivers/staging/wlan-ng/p80211metadef.h
@@ -190,9 +190,9 @@
                         (P80211DID_MKSECTION(2) | \
                         P80211DID_MKGROUP(1))
 #define DIDmib_dot11mac_dot11OperationTable_dot11MACAddress \
-                        ((P80211DID_MKSECTION(2) | \
+                        (P80211DID_MKSECTION(2) | \
                         P80211DID_MKGROUP(1) | \
-                        P80211DID_MKITEM(1) | 0x18000000))
+                        P80211DID_MKITEM(1) | 0x18000000)
 #define DIDmib_dot11mac_dot11OperationTable_dot11RTSThreshold \
                         (P80211DID_MKSECTION(2) | \
                         P80211DID_MKGROUP(1) | \
diff --git a/drivers/staging/wlan-ng/p80211wext.c b/drivers/staging/wlan-ng/p80211wext.c
index 9fb9532c72a7..2fa1dfa23783 100644
--- a/drivers/staging/wlan-ng/p80211wext.c
+++ b/drivers/staging/wlan-ng/p80211wext.c
@@ -46,8 +46,8 @@
 #include <linux/wireless.h>
 #include <net/iw_handler.h>
 #include <linux/if_arp.h>
-#include <asm/bitops.h>
-#include <asm/uaccess.h>
+#include <linux/bitops.h>
+#include <linux/uaccess.h>
 #include <asm/byteorder.h>
 #include <linux/if_ether.h>
 #include <linux/bitops.h>
@@ -553,15 +553,14 @@ static int p80211wext_siwencode(netdevice_t *dev,
         }
 
         /* Check the Key index first. */
-    i = (erq->flags & IW_ENCODE_INDEX);
+        i = (erq->flags & IW_ENCODE_INDEX);
         if (i) {
-
                 if ((i < 1) || (i > NUM_WEPKEYS)) {
                         err = -EINVAL;
                         goto exit;
-                } else
+                } else {
                         i--;
-
+                }
                 /* Set current key number only if no keys are given */
                 if (erq->flags & IW_ENCODE_NOKEY) {
                         result =
diff --git a/drivers/staging/wlan-ng/prism2fw.c b/drivers/staging/wlan-ng/prism2fw.c
index b57601250dc7..4be54cea6ad7 100644
--- a/drivers/staging/wlan-ng/prism2fw.c
+++ b/drivers/staging/wlan-ng/prism2fw.c
@@ -109,9 +109,9 @@ typedef struct pda {
 } pda_t;
 
 typedef struct imgchunk {
-        u32 addr;               /* start address */
-        u32 len;                /* in bytes */
-        u16 crc;                /* CRC value (if it falls at a chunk boundary) */
+        u32 addr;       /* start address */
+        u32 len;        /* in bytes */
+        u16 crc;        /* CRC value (if it falls at a chunk boundary) */
         u8 *data;
 } imgchunk_t;
 
@@ -1159,7 +1159,7 @@ int validate_identity(void)
                         /* SEC compat range */
                         if ((s3info[i].info.compat.role == 1) &&
                             (s3info[i].info.compat.id == 4)) {
-                /* FIXME: isn't something missing here? */
+                                /* FIXME: isn't something missing here? */
                         }
 
                         break;
diff --git a/drivers/staging/wlan-ng/prism2mgmt.c b/drivers/staging/wlan-ng/prism2mgmt.c
index eb7469eaf4b1..ad163da72ae4 100644
--- a/drivers/staging/wlan-ng/prism2mgmt.c
+++ b/drivers/staging/wlan-ng/prism2mgmt.c
@@ -67,7 +67,7 @@
 #include <linux/wireless.h>
 #include <linux/netdevice.h>
 #include <linux/delay.h>
-#include <asm/io.h>
+#include <linux/io.h>
 #include <asm/byteorder.h>
 #include <linux/random.h>
 #include <linux/usb.h>
@@ -1123,8 +1123,8 @@ int prism2mgmt_wlansniff(wlandevice_t *wlandev, void *msgp)
                 if (hw->presniff_port_type != 0) {
                         word = hw->presniff_port_type;
                         result = hfa384x_drvr_setconfig16(hw,
-                                                          HFA384x_RID_CNFPORTTYPE,
-                                                          word);
+                                                  HFA384x_RID_CNFPORTTYPE,
+                                                  word);
                         if (result) {
                                 pr_debug
                                     ("failed to restore porttype, result=%d\n",
@@ -1156,10 +1156,8 @@ int prism2mgmt_wlansniff(wlandevice_t *wlandev, void *msgp)
                         if (wlandev->netdev->type == ARPHRD_ETHER) {
                                 /* Save macport 0 state */
                                 result = hfa384x_drvr_getconfig16(hw,
-                                                                  HFA384x_RID_CNFPORTTYPE,
-                                                                  &
-                                                                  (hw->
-                                                                   presniff_port_type));
+                                                  HFA384x_RID_CNFPORTTYPE,
+                                                  &(hw->presniff_port_type));
                                 if (result) {
                                         pr_debug
                                             ("failed to read porttype, result=%d\n",
@@ -1168,10 +1166,8 @@ int prism2mgmt_wlansniff(wlandevice_t *wlandev, void *msgp)
                                 }
                                 /* Save the wepflags state */
                                 result = hfa384x_drvr_getconfig16(hw,
-                                                                  HFA384x_RID_CNFWEPFLAGS,
-                                                                  &
-                                                                  (hw->
-                                                                   presniff_wepflags));
+                                                  HFA384x_RID_CNFWEPFLAGS,
+                                                  &(hw->presniff_wepflags));
                                 if (result) {
                                         pr_debug
                                             ("failed to read wepflags, result=%d\n",
@@ -1218,8 +1214,8 @@ int prism2mgmt_wlansniff(wlandevice_t *wlandev, void *msgp)
                         /* Set the port type to pIbss */
                         word = HFA384x_PORTTYPE_PSUEDOIBSS;
                         result = hfa384x_drvr_setconfig16(hw,
-                                                          HFA384x_RID_CNFPORTTYPE,
-                                                          word);
+                                                  HFA384x_RID_CNFPORTTYPE,
+                                                  word);
                         if (result) {
                                 pr_debug
                                     ("failed to set porttype %d, result=%d\n",
@@ -1235,8 +1231,8 @@ int prism2mgmt_wlansniff(wlandevice_t *wlandev, void *msgp)
                                     HFA384x_WEPFLAGS_DISABLE_RXCRYPT;
                                 result =
                                     hfa384x_drvr_setconfig16(hw,
-                                                             HFA384x_RID_CNFWEPFLAGS,
-                                                             word);
+                                                     HFA384x_RID_CNFWEPFLAGS,
+                                                     word);
                         }
 
                         if (result) {
diff --git a/drivers/staging/wlan-ng/prism2mib.c b/drivers/staging/wlan-ng/prism2mib.c
index 10b671e973a5..98a5d58c3f55 100644
--- a/drivers/staging/wlan-ng/prism2mib.c
+++ b/drivers/staging/wlan-ng/prism2mib.c
@@ -736,9 +736,9 @@ static int prism2mib_priv(mibrec_t *mib,
 
                                 result =
                                     hfa384x_drvr_setconfig(hw,
-                                                           HFA384x_RID_CNFWPADATA,
-                                                           (u8 *) &wpa,
-                                                           sizeof(wpa));
+                                                   HFA384x_RID_CNFWPADATA,
+                                                   (u8 *) &wpa,
+                                                   sizeof(wpa));
                         }
                         break;
                 }
diff --git a/drivers/staging/wlan-ng/prism2sta.c b/drivers/staging/wlan-ng/prism2sta.c
index 2da405490c65..31ac8da39c81 100644
--- a/drivers/staging/wlan-ng/prism2sta.c
+++ b/drivers/staging/wlan-ng/prism2sta.c
@@ -64,7 +64,7 @@
 #include <linux/byteorder/generic.h>
 #include <linux/ctype.h>
 
-#include <asm/io.h>
+#include <linux/io.h>
 #include <linux/delay.h>
 #include <asm/byteorder.h>
 #include <linux/if_arp.h>