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

Commit f66a27de authored by Arend van Spriel's avatar Arend van Spriel Committed by Greg Kroah-Hartman
Browse files

staging: brcm80211: remove macro definitions from brcmfmac Makefile 



The Makefile for the brcmfmac driver contains macro definitions that
are always set. This patch removes those definitions from the Makefile
and source code.

Reported-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Reviewed-by: default avatarFranky (Zhenhui) Lin <frankyl@broadcom.com>
Reviewed-by: default avatarRoland Vossen <rvossen@broadcom.com>
Signed-off-by: default avatarRoland Vossen <rvossen@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 1bf8b110

drivers/staging/brcm80211/brcmfmac/Makefile

+0 −5
Original line number Diff line number Diff line
@@ -15,11 +15,6 @@ 
# OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN

# CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.



ccflags-y :=			\

	-DBRCMF_FIRSTREAD=64	\

	-DBRCMF_SDALIGN=64	\

	-DMAX_HDR_READ=64



ccflags-$(CONFIG_BRCMDBG)	+= -DSHOW_EVENTS



ccflags-y += \

drivers/staging/brcm80211/brcmfmac/dhd_bus.h

+1 −6
Original line number Diff line number Diff line
@@ -18,12 +18,7 @@ 
#define _BRCMF_BUS_H_



/* Packet alignment for most efficient SDIO (can change based on platform) */

#ifndef BRCMF_SDALIGN

#define BRCMF_SDALIGN	32

#endif

#if !ISPOWEROF2(BRCMF_SDALIGN)

#error BRCMF_SDALIGN is not a power of 2!

#endif

#define BRCMF_SDALIGN	(1 << 6)



/*

 * Exported from brcmf bus module (brcmf_usb, brcmf_sdio)

drivers/staging/brcm80211/brcmfmac/dhd_sdio.c

+2 −13
Original line number Diff line number Diff line
@@ -130,13 +130,8 @@ struct rte_console { 
#define MAX_DATA_BUF	(32 * 1024)	/* Must be large enough to hold

				 biggest possible glom */



#ifndef BRCMF_FIRSTREAD

#define BRCMF_FIRSTREAD	32

#endif

#define BRCMF_FIRSTREAD	(1 << 6)



#if !ISPOWEROF2(BRCMF_FIRSTREAD)

#error BRCMF_FIRSTREAD is not a power of 2!

#endif



/* SBSDIO_DEVICE_CTL */
@@ -362,13 +357,7 @@ struct rte_console { 




/* Space for header read, limit for data packets */

#ifndef MAX_HDR_READ

#define MAX_HDR_READ	32

#endif

#if !ISPOWEROF2(MAX_HDR_READ)

#error MAX_HDR_READ is not a power of 2!

#endif



#define MAX_HDR_READ	(1 << 6)

#define MAX_RX_DATASZ	2048



/* Maximum milliseconds to wait for F2 to come up */