From 39dcff3f45048df1c8bd3e3ba033e7b62328db3f Mon Sep 17 00:00:00 2001 From: Jason Cooper Date: Tue, 14 Sep 2010 09:45:41 -0400 Subject: [PATCH] staging: brcm80211: fix 'ERROR: "(foo*)" should be "(foo *)"' Signed-off-by: Jason Cooper Signed-off-by: Greg Kroah-Hartman --- drivers/staging/brcm80211/include/linux_osl.h | 50 +++++++++---------- drivers/staging/brcm80211/include/linuxver.h | 2 +- .../staging/brcm80211/include/proto/802.11.h | 2 +- .../brcm80211/include/proto/ethernet.h | 12 ++--- drivers/staging/brcm80211/include/typedefs.h | 2 +- drivers/staging/brcm80211/sys/wl_mac80211.c | 2 +- drivers/staging/brcm80211/sys/wlc_bmac.c | 8 +-- drivers/staging/brcm80211/sys/wlc_key.h | 2 +- drivers/staging/brcm80211/sys/wlc_pub.h | 2 +- 9 files changed, 41 insertions(+), 41 deletions(-) diff --git a/drivers/staging/brcm80211/include/linux_osl.h b/drivers/staging/brcm80211/include/linux_osl.h index 28b61caf435..0e61de1b5fc 100644 --- a/drivers/staging/brcm80211/include/linux_osl.h +++ b/drivers/staging/brcm80211/include/linux_osl.h @@ -88,16 +88,16 @@ typedef struct { #define PKTFREESETCB(osh, _tx_fn, _tx_ctx) \ do { \ - ((osl_pubinfo_t*)osh)->tx_fn = _tx_fn; \ - ((osl_pubinfo_t*)osh)->tx_ctx = _tx_ctx; \ + ((osl_pubinfo_t *)osh)->tx_fn = _tx_fn; \ + ((osl_pubinfo_t *)osh)->tx_ctx = _tx_ctx; \ } while (0) #ifdef BCMSDIO #define REGOPSSET(osh, rreg, wreg, ctx) \ do { \ - ((osl_pubinfo_t*)osh)->rreg_fn = rreg; \ - ((osl_pubinfo_t*)osh)->wreg_fn = wreg; \ - ((osl_pubinfo_t*)osh)->reg_ctx = ctx; \ + ((osl_pubinfo_t *)osh)->rreg_fn = rreg; \ + ((osl_pubinfo_t *)osh)->wreg_fn = wreg; \ + ((osl_pubinfo_t *)osh)->reg_ctx = ctx; \ } while (0) #endif @@ -120,7 +120,7 @@ extern uint osl_malloc_failed(osl_t *osh); #define DMA_ALLOC_CONSISTENT(osh, size, align, tot, pap, dmah) \ osl_dma_alloc_consistent((osh), (size), (align), (tot), (pap)) #define DMA_FREE_CONSISTENT(osh, va, size, pa, dmah) \ - osl_dma_free_consistent((osh), (void*)(va), (size), (pa)) + osl_dma_free_consistent((osh), (void *)(va), (size), (pa)) extern uint osl_dma_consistent_align(void); extern void *osl_dma_alloc_consistent(osl_t *osh, uint size, uint16 align, uint *tot, ulong *pap); @@ -149,9 +149,9 @@ extern void osl_dma_unmap(osl_t *osh, uint pa, uint size, int direction); #endif #if defined(BCMSDIO) -#define SELECT_BUS_WRITE(osh, mmap_op, bus_op) if (((osl_pubinfo_t*)(osh))->mmbus) \ +#define SELECT_BUS_WRITE(osh, mmap_op, bus_op) if (((osl_pubinfo_t *)(osh))->mmbus) \ mmap_op else bus_op -#define SELECT_BUS_READ(osh, mmap_op, bus_op) (((osl_pubinfo_t*)(osh))->mmbus) ? \ +#define SELECT_BUS_READ(osh, mmap_op, bus_op) (((osl_pubinfo_t *)(osh))->mmbus) ? \ mmap_op : bus_op #else #define SELECT_BUS_WRITE(osh, mmap_op, bus_op) mmap_op @@ -319,16 +319,16 @@ extern int osl_error(int bcmerror); #define PKTGET(osh, len, send) osl_pktget((osh), (len)) #define PKTDUP(osh, skb) osl_pktdup((osh), (skb)) #define PKTFREE(osh, skb, send) osl_pktfree((osh), (skb), (send)) -#define PKTDATA(skb) (((struct sk_buff*)(skb))->data) -#define PKTLEN(skb) (((struct sk_buff*)(skb))->len) -#define PKTHEADROOM(skb) (PKTDATA(skb)-(((struct sk_buff*)(skb))->head)) -#define PKTTAILROOM(skb) ((((struct sk_buff*)(skb))->end)-(((struct sk_buff*)(skb))->tail)) -#define PKTNEXT(skb) (((struct sk_buff*)(skb))->next) -#define PKTSETNEXT(skb, x) (((struct sk_buff*)(skb))->next = (struct sk_buff*)(x)) -#define PKTSETLEN(skb, len) __skb_trim((struct sk_buff*)(skb), (len)) -#define PKTPUSH(skb, bytes) skb_push((struct sk_buff*)(skb), (bytes)) -#define PKTPULL(skb, bytes) skb_pull((struct sk_buff*)(skb), (bytes)) -#define PKTTAG(skb) ((void*)(((struct sk_buff*)(skb))->cb)) +#define PKTDATA(skb) (((struct sk_buff *)(skb))->data) +#define PKTLEN(skb) (((struct sk_buff *)(skb))->len) +#define PKTHEADROOM(skb) (PKTDATA(skb)-(((struct sk_buff *)(skb))->head)) +#define PKTTAILROOM(skb) ((((struct sk_buff *)(skb))->end)-(((struct sk_buff *)(skb))->tail)) +#define PKTNEXT(skb) (((struct sk_buff *)(skb))->next) +#define PKTSETNEXT(skb, x) (((struct sk_buff *)(skb))->next = (struct sk_buff*)(x)) +#define PKTSETLEN(skb, len) __skb_trim((struct sk_buff *)(skb), (len)) +#define PKTPUSH(skb, bytes) skb_push((struct sk_buff *)(skb), (bytes)) +#define PKTPULL(skb, bytes) skb_pull((struct sk_buff *)(skb), (bytes)) +#define PKTTAG(skb) ((void *)(((struct sk_buff *)(skb))->cb)) #define PKTALLOCED(osh) (((osl_pubinfo_t *)(osh))->pktalloced) #define PKTSETPOOL(osh, skb, x, y) do {} while (0) #define PKTPOOL(osh, skb) FALSE @@ -344,15 +344,15 @@ extern void osl_pktfree(osl_t *osh, void *skb, bool send); extern void *osl_pktget(osl_t *osh, uint len); extern void *osl_pktdup(osl_t *osh, void *skb); -#define PKTLINK(skb) (((struct sk_buff*)(skb))->prev) -#define PKTSETLINK(skb, x) (((struct sk_buff*)(skb))->prev = (struct sk_buff*)(x)) -#define PKTPRIO(skb) (((struct sk_buff*)(skb))->priority) -#define PKTSETPRIO(skb, x) (((struct sk_buff*)(skb))->priority = (x)) -#define PKTSUMNEEDED(skb) (((struct sk_buff*)(skb))->ip_summed == CHECKSUM_HW) -#define PKTSETSUMGOOD(skb, x) (((struct sk_buff*)(skb))->ip_summed = \ +#define PKTLINK(skb) (((struct sk_buff *)(skb))->prev) +#define PKTSETLINK(skb, x) (((struct sk_buff *)(skb))->prev = (struct sk_buff*)(x)) +#define PKTPRIO(skb) (((struct sk_buff *)(skb))->priority) +#define PKTSETPRIO(skb, x) (((struct sk_buff *)(skb))->priority = (x)) +#define PKTSUMNEEDED(skb) (((struct sk_buff *)(skb))->ip_summed == CHECKSUM_HW) +#define PKTSETSUMGOOD(skb, x) (((struct sk_buff *)(skb))->ip_summed = \ ((x) ? CHECKSUM_UNNECESSARY : CHECKSUM_NONE)) /* PKTSETSUMNEEDED and PKTSUMGOOD are not possible because skb->ip_summed is overloaded */ -#define PKTSHARED(skb) (((struct sk_buff*)(skb))->cloned) +#define PKTSHARED(skb) (((struct sk_buff *)(skb))->cloned) #ifdef BCMSDIO #define RPC_READ_REG(osh, r) (\ diff --git a/drivers/staging/brcm80211/include/linuxver.h b/drivers/staging/brcm80211/include/linuxver.h index 3305d41298a..98768d310ff 100644 --- a/drivers/staging/brcm80211/include/linuxver.h +++ b/drivers/staging/brcm80211/include/linuxver.h @@ -104,6 +104,6 @@ typedef irqreturn_t(*FN_ISR) (int irq, void *dev_id, struct pt_regs * ptregs); send_sig(sig, tsk, 1); \ } while (0) -#define WL_DEV_IF(dev) ((wl_if_t*)netdev_priv(dev)) +#define WL_DEV_IF(dev) ((wl_if_t *)netdev_priv(dev)) #endif /* _linuxver_h_ */ diff --git a/drivers/staging/brcm80211/include/proto/802.11.h b/drivers/staging/brcm80211/include/proto/802.11.h index ade5ac80292..a0f7de969f2 100644 --- a/drivers/staging/brcm80211/include/proto/802.11.h +++ b/drivers/staging/brcm80211/include/proto/802.11.h @@ -653,7 +653,7 @@ BWL_PRE_PACKED_STRUCT struct dot11_management_notification { #define WME_INVALID_PARAMETERS 1 #define WME_ADMISSION_REFUSED 3 -#define BCN_PRB_SSID(body) ((char*)(body) + DOT11_BCN_PRB_LEN) +#define BCN_PRB_SSID(body) ((char *)(body) + DOT11_BCN_PRB_LEN) #define DOT11_OPEN_SYSTEM 0 #define DOT11_SHARED_KEY 1 diff --git a/drivers/staging/brcm80211/include/proto/ethernet.h b/drivers/staging/brcm80211/include/proto/ethernet.h index 9d90b8d7f00..9ce8de8cd44 100644 --- a/drivers/staging/brcm80211/include/proto/ethernet.h +++ b/drivers/staging/brcm80211/include/proto/ethernet.h @@ -76,14 +76,14 @@ BWL_PRE_PACKED_STRUCT struct ether_addr { #define ETHER_ISMULTI(ea) (((const uint8 *)(ea))[0] & 1) -#define ether_cmp(a, b) (!(((short*)a)[0] == ((short*)b)[0]) | \ - !(((short*)a)[1] == ((short*)b)[1]) | \ - !(((short*)a)[2] == ((short*)b)[2])) +#define ether_cmp(a, b) (!(((short *)a)[0] == ((short *)b)[0]) | \ + !(((short *)a)[1] == ((short *)b)[1]) | \ + !(((short *)a)[2] == ((short *)b)[2])) #define ether_copy(s, d) { \ - ((short*)d)[0] = ((short*)s)[0]; \ - ((short*)d)[1] = ((short*)s)[1]; \ - ((short*)d)[2] = ((short*)s)[2]; } + ((short *)d)[0] = ((short *)s)[0]; \ + ((short *)d)[1] = ((short *)s)[1]; \ + ((short *)d)[2] = ((short *)s)[2]; } static const struct ether_addr ether_bcast = { {255, 255, 255, 255, 255, 255} }; static const struct ether_addr ether_null = { {0, 0, 0, 0, 0, 0} }; diff --git a/drivers/staging/brcm80211/include/typedefs.h b/drivers/staging/brcm80211/include/typedefs.h index f7d1a5e7efc..45a56b4967e 100644 --- a/drivers/staging/brcm80211/include/typedefs.h +++ b/drivers/staging/brcm80211/include/typedefs.h @@ -162,7 +162,7 @@ typedef float64 float_t; /* define PTRSZ, INLINE */ #ifndef PTRSZ -#define PTRSZ sizeof(char*) +#define PTRSZ sizeof(char *) #endif /* Detect compiler type. */ diff --git a/drivers/staging/brcm80211/sys/wl_mac80211.c b/drivers/staging/brcm80211/sys/wl_mac80211.c index 03eca6b8a48..2ccfcf7c1db 100644 --- a/drivers/staging/brcm80211/sys/wl_mac80211.c +++ b/drivers/staging/brcm80211/sys/wl_mac80211.c @@ -161,7 +161,7 @@ struct ieee80211_tkip_data { }; #ifndef WLC_HIGH_ONLY -#define WL_INFO(dev) ((wl_info_t*)(WL_DEV_IF(dev)->wl)) /* points to wl */ +#define WL_INFO(dev) ((wl_info_t *)(WL_DEV_IF(dev)->wl)) /* points to wl */ static int wl_request_fw(wl_info_t *wl, struct pci_dev *pdev); static void wl_release_fw(wl_info_t *wl); #endif diff --git a/drivers/staging/brcm80211/sys/wlc_bmac.c b/drivers/staging/brcm80211/sys/wlc_bmac.c index 0ddc79421d0..c22394d8453 100644 --- a/drivers/staging/brcm80211/sys/wlc_bmac.c +++ b/drivers/staging/brcm80211/sys/wlc_bmac.c @@ -87,11 +87,11 @@ #define DMAREG(wlc_hw, direction, fifonum) (D11REV_LT(wlc_hw->corerev, 11) ? \ ((direction == DMA_TX) ? \ - (void*)(uintptr)&(wlc_hw->regs->fifo.f32regs.dmaregs[fifonum].xmt) : \ - (void*)(uintptr)&(wlc_hw->regs->fifo.f32regs.dmaregs[fifonum].rcv)) : \ + (void *)(uintptr)&(wlc_hw->regs->fifo.f32regs.dmaregs[fifonum].xmt) : \ + (void *)(uintptr)&(wlc_hw->regs->fifo.f32regs.dmaregs[fifonum].rcv)) : \ ((direction == DMA_TX) ? \ - (void*)(uintptr)&(wlc_hw->regs->fifo.f64regs[fifonum].dmaxmt) : \ - (void*)(uintptr)&(wlc_hw->regs->fifo.f64regs[fifonum].dmarcv))) + (void *)(uintptr)&(wlc_hw->regs->fifo.f64regs[fifonum].dmaxmt) : \ + (void *)(uintptr)&(wlc_hw->regs->fifo.f64regs[fifonum].dmarcv))) /* * The following table lists the buffer memory allocated to xmt fifos in HW. diff --git a/drivers/staging/brcm80211/sys/wlc_key.h b/drivers/staging/brcm80211/sys/wlc_key.h index 9d2ea4ebc9d..0abc958ca51 100644 --- a/drivers/staging/brcm80211/sys/wlc_key.h +++ b/drivers/staging/brcm80211/sys/wlc_key.h @@ -69,7 +69,7 @@ struct wlc_bsscfg; /* default key */ #define WSEC_BSS_DEFAULT_KEY(bsscfg) (((bsscfg)->wsec_index == -1) ? \ - (struct wsec_key*)NULL : (bsscfg)->bss_def_keys[(bsscfg)->wsec_index]) + (struct wsec_key *)NULL : (bsscfg)->bss_def_keys[(bsscfg)->wsec_index]) /* Macros for key management in IBSS mode */ #define WSEC_IBSS_MAX_PEERS 16 /* Max # of IBSS Peers */ diff --git a/drivers/staging/brcm80211/sys/wlc_pub.h b/drivers/staging/brcm80211/sys/wlc_pub.h index b7c986685fc..fdf854f8e02 100644 --- a/drivers/staging/brcm80211/sys/wlc_pub.h +++ b/drivers/staging/brcm80211/sys/wlc_pub.h @@ -417,7 +417,7 @@ typedef struct { } shared; } wlc_pkttag_t; -#define WLPKTTAG(p) ((wlc_pkttag_t*)PKTTAG(p)) +#define WLPKTTAG(p) ((wlc_pkttag_t *)PKTTAG(p)) /* Flags used in wlc_pkttag_t. * If adding a flag, be sure to check if WLPKTTAG_FLAG_MOVE should transfer it. -- 2.20.1