diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c b/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c
index 9caf785cc468db96a2cb05abf562b541bdc30cea..b013a65203cf647f3e23f4e4f6a595f948187d9b 100644
--- a/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c
+++ b/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c
@@ -985,7 +985,8 @@ sdioh_request_packet(sdioh_info_t *sd, uint fix_inc, uint write, uint func,
 
 		if (err_ret) {
 			sd_err(("%s: %s FAILED %p[%d], addr=0x%05x, pkt_len=%d,"
-				 "ERR=0x%08x\n", __func__, (write) ? "TX":"RX",
+				 "ERR=0x%08x\n", __func__,
+				 (write) ? "TX" : "RX",
 				 pnext, SGCount, addr, pkt_len, err_ret));
 		} else {
 			sd_trace(("%s: %s xfr'd %p[%d], addr=0x%05x, len=%d\n",
diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_custom_gpio.c b/drivers/staging/brcm80211/brcmfmac/dhd_custom_gpio.c
index bd044c1a17c4948a39f5d932c6a3cb6d484621e0..5a86f924748bc9c6eeb67a74866ed80d1547b635 100644
--- a/drivers/staging/brcm80211/brcmfmac/dhd_custom_gpio.c
+++ b/drivers/staging/brcm80211/brcmfmac/dhd_custom_gpio.c
@@ -151,7 +151,7 @@ int dhd_custom_get_mac_address(unsigned char *buf)
 	/* EXAMPLE code */
 	{
 		struct ether_addr ea_example = {
-			{0x00, 0x11, 0x22, 0x33, 0x44, 0xFF}};
+			{0x00, 0x11, 0x22, 0x33, 0x44, 0xFF} };
 		bcopy((char *)&ea_example, buf, sizeof(struct ether_addr));
 	}
 #endif				/* EXAMPLE_GET_MAC */
diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c b/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
index 87204b7bdd2c057c3d7752b1a079a94f1aa65038..60b499a597f030c5bf227aef2aa98dcbea019d89 100644
--- a/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
+++ b/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
@@ -1421,7 +1421,7 @@ int dhd_bus_rxctl(struct dhd_bus *bus, unsigned char *msg, uint msglen)
 	else
 		bus->dhd->rx_ctlerrs++;
 
-	return rxlen ? (int)rxlen:-ETIMEDOUT;
+	return rxlen ? (int)rxlen : -ETIMEDOUT;
 }
 
 /* IOVar table */
@@ -3969,7 +3969,7 @@ static uint dhdsdio_readframes(dhd_bus_t *bus, uint maxframes, bool *finished)
 		}
 
 		/* Validate check bytes */
-		if ((uint16) ~ (len ^ check)) {
+		if ((uint16) ~(len ^ check)) {
 			DHD_ERROR(("%s: HW hdr err: len/check 0x%04x/0x%04x\n",
 				__func__, len, check));
 			bus->rx_badhdr++;
diff --git a/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c b/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
index 38672930ca102e187901e4cee1a277e405a1e55a..0c5d5cf29fc321aaed6cdb7c12e0706985fcedf3 100644
--- a/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
+++ b/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
@@ -2635,7 +2635,7 @@ static void wl_init_conf(struct wl_conf *conf)
 	conf->rts_threshold = (uint32)-1;
 	conf->retry_short = (uint32)-1;
 	conf->retry_long = (uint32)-1;
-	conf->tx_power =-1;
+	conf->tx_power = -1;
 }
 
 static void wl_init_prof(struct wl_profile *prof)