From: Arend van Spriel Date: Thu, 9 Jun 2011 14:44:59 +0000 (+0200) Subject: staging: brcm80211: fix checkpatch errors from main.c X-Git-Tag: next-20110726~5^2~550 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=835ef44c60bf36411dfaf37b43f5058214bbc016;p=karo-tx-linux.git staging: brcm80211: fix checkpatch errors from main.c The softmac source file main.c was passed through checkpatch to see what issues against coding style are still present. This patch removes the checkpatch errors listed below. ERROR: trailing whitespace +^Imemcpy(wlc->default_bss->rateset.rates, rs.rates, $ -- ERROR: spaces required around that ':' (ctx:VxV) + pval = arg ? (int *)arg:NULL; -- Signed-off-by: Arend van Spriel Reviewed-by: Roland Vossen Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/brcm80211/brcmsmac/main.c b/drivers/staging/brcm80211/brcmsmac/main.c index e2d8d2319b88..611873ce4977 100644 --- a/drivers/staging/brcm80211/brcmsmac/main.c +++ b/drivers/staging/brcm80211/brcmsmac/main.c @@ -278,7 +278,7 @@ const u8 wme_fifo2ac[] = { AC_BK, AC_BE, AC_VI, AC_VO, AC_BE, AC_BE }; /* WME/802.1E Access Category to TX FIFO number */ static const u8 wme_ac2fifo[] = { 1, 0, 2, 3 }; -static bool in_send_q = false; +static bool in_send_q; /* Shared memory location index for various AC params */ #define wme_shmemacindex(ac) wme_ac2fifo[ac] @@ -2363,7 +2363,7 @@ int brcms_c_set_gmode(struct brcms_c_info *wlc, u8 gmode, bool config) /* Set default bss rateset */ wlc->default_bss->rateset.count = rs.count; - memcpy(wlc->default_bss->rateset.rates, rs.rates, + memcpy(wlc->default_bss->rateset.rates, rs.rates, sizeof(wlc->default_bss->rateset.rates)); return ret; @@ -2556,7 +2556,7 @@ _brcms_c_ioctl(struct brcms_c_info *wlc, int cmd, void *arg, int len, } /* default argument is generic integer */ - pval = arg ? (int *)arg:NULL; + pval = arg ? (int *)arg : NULL; /* This will prevent the misaligned access */ if (pval && (u32) len >= sizeof(val))