github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-05 21:15:53 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

staging: brcm80211: cleanup after R_REG/W_REG patches

Browse Source 
Code cleanup. Removed unused sections. Added () to make macro safe.

Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Roland Vossen 2011-06-01 13:45:57 +02:00 committed by Greg Kroah-Hartman
parent b61a4be59b
commit 25036341c3
3 changed files with 6 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
View File

@ -32,51 +32,34 @@
#include <bcmsoc.h>
/* register access macros */
#if defined(BCMSDIO)
#ifdef BRCM_FULLMAC
#include <bcmsdh.h>
#endif
#endif
/* register access macros */
#ifndef __BIG_ENDIAN
#ifndef __mips__
#define R_REG(r) \
bcmsdh_reg_read(NULL, (unsigned long)r, sizeof(*r))
bcmsdh_reg_read(NULL, (unsigned long)(r), sizeof(*(r)))
#else /* __mips__ */
#define R_REG(r) \
({ \
__typeof(*(r)) __osl_v; \
__asm__ __volatile__("sync"); \
__osl_v = bcmsdh_reg_read(NULL, (unsigned long)r, sizeof(*r)); \
__osl_v = bcmsdh_reg_read(NULL, (unsigned long)(r),\
sizeof(*(r))); \
__asm__ __volatile__("sync"); \
__osl_v; \
})
#endif /* __mips__ */
#define W_REG(r, v) do { \
bcmsdh_reg_write(NULL, (unsigned long)r, sizeof(*r), (v)); \
bcmsdh_reg_write(NULL, (unsigned long)(r), sizeof(*(r)), (v)); \
} while (0)
#else /* __BIG_ENDIAN */
#define R_REG(r) \
bcmsdh_reg_read(NULL, (unsigned long)r, sizeof(*r))
bcmsdh_reg_read(NULL, (unsigned long)(r), sizeof(*(r)))
#define W_REG(r, v) do { \
bcmsdh_reg_write(NULL, (unsigned long)r, sizeof(*r), v); \
bcmsdh_reg_write(NULL, (unsigned long)(r), sizeof(*(r)), (v)); \
} while (0)
#endif /* __BIG_ENDIAN */
#ifdef __mips__
/*
* bcm4716 (which includes 4717 & 4718), plus 4706 on PCIe can reorder
* transactions. As a fix, a read after write is performed on certain places
* in the code. Older chips and the newer 5357 family don't require this fix.
*/
#define W_REG_FLUSH(r, v) ({ W_REG((r), (v)); (void)R_REG(r); })
#else
#define W_REG_FLUSH(r, v) W_REG((r), (v))
#endif /* __mips__ */
#define AND_REG(r, v) W_REG((r), R_REG(r) & (v))
#define OR_REG(r, v) W_REG((r), R_REG(r) | (v))

7
drivers/staging/brcm80211/brcmsmac/wlc_types.h
View File

@ -41,13 +41,6 @@ do { \
#define WL_ERROR_ON() (brcm_msg_level & LOG_ERROR_VAL)
/* register access macros */
#if defined(BCMSDIO)
#ifdef BRCM_FULLMAC
#include <bcmsdh.h>
#endif
#endif
/* register access macros */
#ifndef __BIG_ENDIAN
#ifndef __mips__

4
drivers/staging/brcm80211/include/brcmu_utils.h
View File

@ -239,10 +239,6 @@ extern int brcmu_iovar_lencheck(const struct brcmu_iovar *table, void *arg,
#define PKTBUFSZ 2048
#define OSL_SYSUPTIME() ((u32)jiffies * (1000 / HZ))
#ifdef BRCM_FULLMAC
#include <linux/kernel.h> /* for vsn/printf's */
#include <linux/string.h> /* for mem*, str* */
#endif
#ifndef setbit
#ifndef NBBY /* the BSD family defines NBBY */