Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1f7a0c7c authored by Roland Vossen's avatar Roland Vossen Committed by Greg Kroah-Hartman
Browse files

staging: brcm80211: macro cleanup 



Code cleanup. Replaced bcopy() by memcpy(). Removed redundant PAD
macro definitions.

Signed-off-by: default avatarRoland Vossen <rvossen@broadcom.com>
Reviewed-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent d33fcc30

drivers/staging/brcm80211/brcmfmac/dhd_sdio.c

+0 −8
Original line number Diff line number Diff line
@@ -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

drivers/staging/brcm80211/brcmfmac/sbsdpcmdev.h

+0 −7
Original line number Diff line number Diff line
@@ -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 */

drivers/staging/brcm80211/brcmsmac/aiutils.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/staging/brcm80211/brcmsmac/aiutils.h

+0 −7
Original line number Diff line number Diff line
@@ -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>

drivers/staging/brcm80211/brcmsmac/bcmnvram.h

+0 −4
Original line number Diff line number Diff line
@@ -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);