summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJason Cooper <jason@lakedaemon.net>2010-10-06 10:08:02 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2010-10-06 08:20:42 -0700
commite9887c9d9c37b8af80ae04aad1532d5c46687f8b (patch)
tree105bb7a556ea73173ac9ed903c55127331b97e35 /drivers
parent5f782dee8d58247f2a277f142a59c227fd0b500e (diff)
downloadlinux-e9887c9d9c37b8af80ae04aad1532d5c46687f8b.tar.bz2
staging: brcm80211: fix various checkpatch spacing errors.
Signed-off-by: Jason Cooper <jason@lakedaemon.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c3
-rw-r--r--drivers/staging/brcm80211/brcmfmac/dhd_custom_gpio.c2
-rw-r--r--drivers/staging/brcm80211/brcmfmac/dhd_sdio.c4
-rw-r--r--drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c2
4 files changed, 6 insertions, 5 deletions
diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c b/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c
index 9caf785cc468..b013a65203cf 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 bd044c1a17c4..5a86f924748b 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 87204b7bdd2c..60b499a597f0 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 38672930ca10..0c5d5cf29fc3 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)