diff --git a/drivers/net/wireless/cw1200/Kconfig b/drivers/net/wireless/cw1200/Kconfig
index 36748c5..de57443 100644
--- a/drivers/net/wireless/cw1200/Kconfig
+++ b/drivers/net/wireless/cw1200/Kconfig
@@ -3,7 +3,7 @@ config CW1200
        depends on MAC80211 && CFG80211
        help
          This is driver for the ST-E CW1100 & CW1200 WLAN chipsets.
-         This option just enables the driver core, see below for 
+         This option just enables the driver core, see below for
 	 specific bus support.
 
 if CW1200
@@ -24,7 +24,7 @@ config CW1200_WLAN_SAGRAD
        tristate "Support Sagrad SG901-1091/1098 modules"
        depends on CW1200_WLAN_SDIO
        help
-	 This provides the platform data glue to support the 
+	 This provides the platform data glue to support the
 	 Sagrad SG901-1091/1098 modules in their standard SDIO EVK.
 	 It also includes example SPI platform data.
 
@@ -33,12 +33,12 @@ menu "Driver debug features"
 
 config CW1200_ETF
        bool "Enable CW1200 Engineering Test Framework hooks"
-       help 
+       help
        	 If you don't know what this is, just say N.
 
 config CW1200_ITP
        bool "Enable ITP access"
-	 help 
+	 help
 	 If you don't know what this is, just say N.
 
 endmenu
diff --git a/drivers/net/wireless/cw1200/sta.c b/drivers/net/wireless/cw1200/sta.c
index 5e5f126..a4d0fdc 100644
--- a/drivers/net/wireless/cw1200/sta.c
+++ b/drivers/net/wireless/cw1200/sta.c
@@ -1865,7 +1865,7 @@ void cw1200_bss_info_changed(struct ieee80211_hw *dev,
 
 			val = cpu_to_le32(val);
 			wsm_write_mib(priv, WSM_MID_ID_SET_HT_PROTECTION,
-					      &val, sizeof(val));
+				      &val, sizeof(val));
 
 			priv->association_mode.greenfield =
 				cw1200_ht_greenfield(&priv->ht_info);
diff --git a/drivers/net/wireless/cw1200/txrx.c b/drivers/net/wireless/cw1200/txrx.c
index 49d0750..afe4110 100644
--- a/drivers/net/wireless/cw1200/txrx.c
+++ b/drivers/net/wireless/cw1200/txrx.c
@@ -1112,8 +1112,8 @@ void cw1200_rx_cb(struct cw1200_common *priv,
 			icv_len = 16 /* WAPI_MIC_LEN */;
 			break;
 		default:
-			pr_warning("Unknown encryption type %d\n", 
-				   WSM_RX_STATUS_ENCRYPTION(arg->flags));
+			pr_warn("Unknown encryption type %d\n",
+				WSM_RX_STATUS_ENCRYPTION(arg->flags));
 			goto drop;
 		}