diff options
| author |   Roland Vossen <rvossen@broadcom.com> | 2011-06-01 13:45:32 +0200 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@suse.de> | 2011-06-07 12:37:03 -0700 |
| commit | 1f7a0c7c00936db0740f368034815e52248e1864 (patch) | |
| tree | caaab1b4760c6ac2051f108a53b847b9d058a635 /drivers/staging/brcm80211/include | |
| parent | staging: brcm80211: moved sbdma.h into brcmsmac/bcmdma.h (diff) | |
| download | linux-dev-1f7a0c7c00936db0740f368034815e52248e1864.tar.xz linux-dev-1f7a0c7c00936db0740f368034815e52248e1864.zip | |
staging: brcm80211: macro cleanup
Code cleanup. Replaced bcopy() by memcpy(). Removed redundant PAD
macro definitions.
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>
Diffstat (limited to 'drivers/staging/brcm80211/include')
| -rw-r--r-- | drivers/staging/brcm80211/include/aidmp.h | 6 | ||||
| -rw-r--r-- | drivers/staging/brcm80211/include/bcmutils.h | 2 | ||||
| -rw-r--r-- | drivers/staging/brcm80211/include/chipcommon.h | 7 |
3 files changed, 3 insertions, 12 deletions
diff --git a/drivers/staging/brcm80211/include/aidmp.h b/drivers/staging/brcm80211/include/aidmp.h index 7e0ce8f24348..2c10177151a3 100644 --- a/drivers/staging/brcm80211/include/aidmp.h +++ b/drivers/staging/brcm80211/include/aidmp.h @@ -17,6 +17,8 @@ #ifndef _AIDMP_H #define _AIDMP_H +#include "bcmdefs.h" /* for PAD macro */ + /* Manufacturer Ids */ #define MFGID_ARM 0x43b #define MFGID_BRCM 0x4bf @@ -100,8 +102,6 @@ #define SD_SG32 0x00000008 #define SD_SZ_ALIGN 0x00000fff -#ifndef _LANGUAGE_ASSEMBLY - typedef volatile struct _aidmp { u32 oobselina30; /* 0x000 */ u32 oobselina74; /* 0x004 */ @@ -220,8 +220,6 @@ typedef volatile struct _aidmp { u32 componentid3; /* 0xffc */ } aidmp_t; -#endif /* _LANGUAGE_ASSEMBLY */ - /* Out-of-band Router registers */ #define OOB_BUSCONFIG 0x020 #define OOB_STATUSA 0x100 diff --git a/drivers/staging/brcm80211/include/bcmutils.h b/drivers/staging/brcm80211/include/bcmutils.h index d7f531e2b83f..1a1c8ad32671 100644 --- a/drivers/staging/brcm80211/include/bcmutils.h +++ b/drivers/staging/brcm80211/include/bcmutils.h @@ -272,8 +272,6 @@ extern void bcm_prpkt(const char *msg, struct sk_buff *p0); #include <linux/kernel.h> /* for vsn/printf's */ #include <linux/string.h> /* for mem*, str* */ #endif -/* bcopy's: Linux kernel doesn't provide these (anymore) */ -#define bcopy(src, dst, len) memcpy((dst), (src), (len)) /* register access macros */ #ifndef __BIG_ENDIAN diff --git a/drivers/staging/brcm80211/include/chipcommon.h b/drivers/staging/brcm80211/include/chipcommon.h index 9ca2e691caad..ee1130fcb20a 100644 --- a/drivers/staging/brcm80211/include/chipcommon.h +++ b/drivers/staging/brcm80211/include/chipcommon.h @@ -17,12 +17,7 @@ #ifndef _SBCHIPC_H #define _SBCHIPC_H -/* cpp contortions to concatenate w/arg prescan */ -#ifndef PAD -#define _PADLINE(line) pad ## line -#define _XSTR(line) _PADLINE(line) -#define PAD _XSTR(__LINE__) -#endif /* PAD */ +#include "bcmdefs.h" /* for PAD macro */ typedef volatile struct { u32 chipid; /* 0x0 */ |