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

Commit 9e631b8c authored by Roland Vossen's avatar Roland Vossen Committed by Greg Kroah-Hartman
Browse files

staging: brcm80211: remove MIPS specific 'sync' instruction in fullmac 



This instruction was required for the bcm4716/bcm4322, but since the
fullmac driver only supports bcm4329, it could be removed. After that,
the R_REG macro's were identical and thus were reduced to just 1 R_REG
macro.

Reviewed-by: default avatarPieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: default avatarFranky (Zhenhui) Lin <frankyl@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 98ff86e3

drivers/staging/brcm80211/brcmfmac/dhd_sdio.c

+0 −18
Original line number Diff line number Diff line
@@ -35,26 +35,8 @@ 
#include "sdio_host.h"



/* register access macros */

#ifndef __BIG_ENDIAN

#ifndef __mips__

#define R_REG(r, typ) \

	brcmf_sdcard_reg_read(NULL, (r), sizeof(typ))

#else				/* __mips__ */

#define R_REG(r, typ) \

	({ \

		__typeof(*(r)) __osl_v; \

		__asm__ __volatile__("sync"); \

		__osl_v = brcmf_sdcard_reg_read(NULL, (r),\

					  sizeof(typ)); \

		__asm__ __volatile__("sync"); \

		__osl_v; \

	})

#endif				/* __mips__ */



#else				/* __BIG_ENDIAN */

#define R_REG(r, typ) \

	brcmf_sdcard_reg_read(NULL, (r), sizeof(typ))

#endif				/* __BIG_ENDIAN */



#define OR_REG(r, v, typ) \

	brcmf_sdcard_reg_write(NULL, (r), sizeof(typ), R_REG(r, typ) | (v))