diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
index d8948bf8a27510ddbcb3b191c355ad10824503be..42670acd144b4502b649160684194fada14aa6e4 100644
--- a/drivers/net/wireless/airo.c
+++ b/drivers/net/wireless/airo.c
@@ -6408,9 +6408,8 @@ static int airo_set_encode(struct net_device *dev,
 			set_wep_key(local, index, NULL, 0, perm, 1);
 		} else
 			/* Don't complain if only change the mode */
-			if(!(dwrq->flags & IW_ENCODE_MODE)) {
+			if (!(dwrq->flags & IW_ENCODE_MODE))
 				return -EINVAL;
-			}
 	}
 	/* Read the flags */
 	if(dwrq->flags & IW_ENCODE_DISABLED)
diff --git a/drivers/net/wireless/atmel.c b/drivers/net/wireless/atmel.c
index 57cc7e58bfe507171f0e6a5657c3c778a0b9de5d..32fbaf20d272c3591852d04813d771ed04b13ec6 100644
--- a/drivers/net/wireless/atmel.c
+++ b/drivers/net/wireless/atmel.c
@@ -1759,9 +1759,8 @@ static int atmel_set_encode(struct net_device *dev,
 			priv->default_key = index;
 		} else
 			/* Don't complain if only change the mode */
-			if (!(dwrq->flags & IW_ENCODE_MODE)) {
+			if (!(dwrq->flags & IW_ENCODE_MODE))
 				return -EINVAL;
-			}
 	}
 	/* Read the flags */
 	if (dwrq->flags & IW_ENCODE_DISABLED) {
diff --git a/drivers/net/wireless/b43legacy/rfkill.c b/drivers/net/wireless/b43legacy/rfkill.c
index b6bf205c6455f4851d963dff0eac37e7b994accc..a366129c8b0bc36727ed0654704f6259ee8c3e89 100644
--- a/drivers/net/wireless/b43legacy/rfkill.c
+++ b/drivers/net/wireless/b43legacy/rfkill.c
@@ -97,7 +97,7 @@ static int b43legacy_rfkill_soft_toggle(void *data, enum rfkill_state state)
 	return err;
 }
 
-char * b43legacy_rfkill_led_name(struct b43legacy_wldev *dev)
+char *b43legacy_rfkill_led_name(struct b43legacy_wldev *dev)
 {
 	struct b43legacy_wl *wl = dev->wl;
 
diff --git a/drivers/net/wireless/b43legacy/rfkill.h b/drivers/net/wireless/b43legacy/rfkill.h
index 4a81ba3f54f24b6019f229b3cbf11e451704f9ce..b68215e788e2659bfa38e51fe2ef0580e4922abd 100644
--- a/drivers/net/wireless/b43legacy/rfkill.h
+++ b/drivers/net/wireless/b43legacy/rfkill.h
@@ -27,7 +27,7 @@ void b43legacy_rfkill_free(struct b43legacy_wldev *dev);
 void b43legacy_rfkill_init(struct b43legacy_wldev *dev);
 void b43legacy_rfkill_exit(struct b43legacy_wldev *dev);
 
-char * b43legacy_rfkill_led_name(struct b43legacy_wldev *dev);
+char *b43legacy_rfkill_led_name(struct b43legacy_wldev *dev);
 
 
 #else /* CONFIG_B43LEGACY_RFKILL */
@@ -49,7 +49,7 @@ static inline void b43legacy_rfkill_init(struct b43legacy_wldev *dev)
 static inline void b43legacy_rfkill_exit(struct b43legacy_wldev *dev)
 {
 }
-static inline char * b43legacy_rfkill_led_name(struct b43legacy_wldev *dev)
+static inline char *b43legacy_rfkill_led_name(struct b43legacy_wldev *dev)
 {
 	return NULL;
 }
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945-hw.h b/drivers/net/wireless/iwlwifi/iwl-3945-hw.h
index 0a5a08d19f55e17a8d89471140de98675688e74c..71c9a7e32d1b7cf7d1ba6010c9fc4358c2bb9991 100644
--- a/drivers/net/wireless/iwlwifi/iwl-3945-hw.h
+++ b/drivers/net/wireless/iwlwifi/iwl-3945-hw.h
@@ -350,7 +350,7 @@ struct iwl_eeprom {
 
 #define CSR_FH_INT_TX_MASK	(CSR_FH_INT_BIT_TX_CHNL6 | \
 				 CSR_FH_INT_BIT_TX_CHNL1 | \
-				 CSR_FH_INT_BIT_TX_CHNL0 )
+				 CSR_FH_INT_BIT_TX_CHNL0)
 
 
 /* RESET */
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965-hw.h b/drivers/net/wireless/iwlwifi/iwl-4965-hw.h
index 21c75774cf4e080bf1b69730f465886afe97de1c..4afd69da375fa164844662e26d7c31bbe3b76424 100644
--- a/drivers/net/wireless/iwlwifi/iwl-4965-hw.h
+++ b/drivers/net/wireless/iwlwifi/iwl-4965-hw.h
@@ -400,7 +400,7 @@ struct iwl_eeprom {
 
 #define CSR_FH_INT_TX_MASK	(CSR_FH_INT_BIT_TX_CHNL6 | \
 				 CSR_FH_INT_BIT_TX_CHNL1 | \
-				 CSR_FH_INT_BIT_TX_CHNL0 )
+				 CSR_FH_INT_BIT_TX_CHNL0)
 
 
 /* RESET */
diff --git a/drivers/net/wireless/libertas/wext.c b/drivers/net/wireless/libertas/wext.c
index 4ef5b9e00c770b1235636f298a445304be011b03..19c2873d2d78fcd418573912f2bb488e4fcb7f7b 100644
--- a/drivers/net/wireless/libertas/wext.c
+++ b/drivers/net/wireless/libertas/wext.c
@@ -32,10 +32,8 @@ static inline void libertas_postpone_association_work(wlan_private *priv)
 static inline void libertas_cancel_association_work(wlan_private *priv)
 {
 	cancel_delayed_work(&priv->assoc_work);
-	if (priv->adapter->pending_assoc_req) {
-		kfree(priv->adapter->pending_assoc_req);
-		priv->adapter->pending_assoc_req = NULL;
-	}
+	kfree(priv->adapter->pending_assoc_req);
+	priv->adapter->pending_assoc_req = NULL;
 }
 
 
diff --git a/drivers/net/wireless/wavelan_cs.c b/drivers/net/wireless/wavelan_cs.c
index f5b38de4f0df4ea2f10b86f8ca144d5c5b534c72..da1d4e8f0f6b35c0abc40799a930eaf5f3c3ecad 100644
--- a/drivers/net/wireless/wavelan_cs.c
+++ b/drivers/net/wireless/wavelan_cs.c
@@ -3223,14 +3223,14 @@ wv_mmc_init(struct net_device *	dev)
    * non-NCR/AT&T/Lucent PCMCIA cards, see wavelan_cs.h for detail on
    * how to configure your card...
    */
-  for(i = 0; i < ARRAY_SIZE(MAC_ADDRESSES); i++)
-    if((psa.psa_univ_mac_addr[0] == MAC_ADDRESSES[i][0]) &&
-       (psa.psa_univ_mac_addr[1] == MAC_ADDRESSES[i][1]) &&
-       (psa.psa_univ_mac_addr[2] == MAC_ADDRESSES[i][2]))
+  for (i = 0; i < ARRAY_SIZE(MAC_ADDRESSES); i++)
+    if ((psa.psa_univ_mac_addr[0] == MAC_ADDRESSES[i][0]) &&
+        (psa.psa_univ_mac_addr[1] == MAC_ADDRESSES[i][1]) &&
+        (psa.psa_univ_mac_addr[2] == MAC_ADDRESSES[i][2]))
       break;
 
   /* If we have not found it... */
-  if(i == ARRAY_SIZE(MAC_ADDRESSES))
+  if (i == ARRAY_SIZE(MAC_ADDRESSES))
     {
 #ifdef DEBUG_CONFIG_ERRORS
       printk(KERN_WARNING "%s: wv_mmc_init(): Invalid MAC address: %02X:%02X:%02X:...\n",