shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-03 17:51:57 +09:00
Code Issues Packages Projects Releases Wiki Activity

staging: brcm80211: macro cleanup

Browse Source 
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>
This commit is contained in:
Roland Vossen
2011-06-01 13:45:32 +02:00
committed by Greg Kroah-Hartman
parent d33fcc301d
commit 1f7a0c7c00
10 changed files with 4 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -61,8 +61,6 @@
#define TRAP_T_SIZE 80
#ifndef _LANGUAGE_ASSEMBLY
typedef struct _trap_struct {
u32 type;
u32 epc;
@@ -86,8 +84,6 @@ typedef struct _trap_struct {
u32 pc;
} trap_t;
#endif /* !_LANGUAGE_ASSEMBLY */
#define CBUF_LEN (128)
#define LOG_BUF_LEN 1024
@@ -448,8 +444,6 @@ typedef struct dhd_bus {
bool ctrl_frame_stat;
} dhd_bus_t;
#ifndef _LANGUAGE_ASSEMBLY
typedef volatile struct _sbconfig {
u32 PAD[2];
u32 sbipsflag; /* initiator port ocp slave flag */
@@ -490,8 +484,6 @@ typedef volatile struct _sbconfig {
u32 sbidhigh; /* identification */
} sbconfig_t;
#endif /* _LANGUAGE_ASSEMBLY */
/* clkstate */
#define CLK_NONE 0
#define CLK_SDONLY 1

7
drivers/staging/brcm80211/brcmfmac/sbsdpcmdev.h
View File

@@ -17,13 +17,6 @@
#ifndef _sbsdpcmdev_h_
#define _sbsdpcmdev_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 */
/* core registers */
typedef volatile struct {
u32 corecontrol; /* CoreControl, 0x000, rev8 */

2
drivers/staging/brcm80211/brcmsmac/aiutils.c
View File

@@ -1082,7 +1082,7 @@ void ai_detach(struct si_pub *sih)
uint idx;
struct si_pub *si_local = NULL;
bcopy(&sih, &si_local, sizeof(struct si_pub **));
memcpy(&si_local, &sih, sizeof(struct si_pub **));
sii = SI_INFO(sih);

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

@@ -17,13 +17,6 @@
#ifndef _aiutils_h_
#define _aiutils_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
/* Include the soci specific files */
#include <aidmp.h>

4
drivers/staging/brcm80211/brcmsmac/bcmnvram.h
View File

@@ -17,8 +17,6 @@
#ifndef _bcmnvram_h_
#define _bcmnvram_h_
#ifndef _LANGUAGE_ASSEMBLY
#include <bcmdefs.h>
struct nvram_header {
@@ -128,8 +126,6 @@ extern int nvram_commit(void);
*/
extern int nvram_getall(char *nvram_buf, int count);
#endif /* _LANGUAGE_ASSEMBLY */
/* variable access */
extern char *getvar(char *vars, const char *name);
extern int getintvar(char *vars, const char *name);

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

@@ -19,13 +19,6 @@
#include <linux/ieee80211.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
#define BCN_TMPL_LEN 512 /* length of the BCN template area */
/* RX FIFO numbers */

7
drivers/staging/brcm80211/brcmsmac/nicpci.c
View File

@@ -117,13 +117,6 @@
/* PCIE protocol TLP diagnostic registers */
#define PCIE_TLP_WORKAROUNDSREG 0x004 /* TLP Workarounds */
/* cpp contortions to concatenate w/arg prescan */
#ifndef PAD
#define _PADLINE(line) pad ## line
#define _XSTR(line) _PADLINE(line)
#define PAD _XSTR(__LINE__)
#endif
/* Sonics side: PCI core and host control registers */
struct sbpciregs {
u32 control; /* PCI control */

6
drivers/staging/brcm80211/include/aidmp.h
View File

@@ -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

2
drivers/staging/brcm80211/include/bcmutils.h
View File

@@ -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

7
drivers/staging/brcm80211/include/chipcommon.h
View File

@@ -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 */