lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

staging: brcm80211: remove macro definitions from brcmfmac Makefile

Browse Source 
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: Johannes Berg <johannes@sipsolutions.net>
Reviewed-by: Franky (Zhenhui) Lin <frankyl@broadcom.com>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Arend van Spriel
2011-08-26 15:19:31 +02:00
committed by Greg Kroah-Hartman
parent 1bf8b11069
commit f66a27de20
3 changed files with 3 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/staging/brcm80211/brcmfmac/Makefile
View File

@@ -15,11 +15,6 @@
# OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN # OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
# CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # 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-$(CONFIG_BRCMDBG) += -DSHOW_EVENTS
ccflags-y += \ ccflags-y += \

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

@@ -18,12 +18,7 @@
#define _BRCMF_BUS_H_ #define _BRCMF_BUS_H_
/* Packet alignment for most efficient SDIO (can change based on platform) */ /* Packet alignment for most efficient SDIO (can change based on platform) */
#ifndef BRCMF_SDALIGN #define BRCMF_SDALIGN (1 << 6)
#define BRCMF_SDALIGN 32
#endif
#if !ISPOWEROF2(BRCMF_SDALIGN)
#error BRCMF_SDALIGN is not a power of 2!
#endif
/* /*
* Exported from brcmf bus module (brcmf_usb, brcmf_sdio) * Exported from brcmf bus module (brcmf_usb, brcmf_sdio)

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

@@ -130,13 +130,8 @@ struct rte_console {
#define MAX_DATA_BUF (32 * 1024) /* Must be large enough to hold #define MAX_DATA_BUF (32 * 1024) /* Must be large enough to hold
biggest possible glom */ biggest possible glom */
#ifndef BRCMF_FIRSTREAD #define BRCMF_FIRSTREAD (1 << 6)
#define BRCMF_FIRSTREAD 32
#endif
#if !ISPOWEROF2(BRCMF_FIRSTREAD)
#error BRCMF_FIRSTREAD is not a power of 2!
#endif
/* SBSDIO_DEVICE_CTL */ /* SBSDIO_DEVICE_CTL */
@@ -362,13 +357,7 @@ struct rte_console {
/* Space for header read, limit for data packets */ /* Space for header read, limit for data packets */
#ifndef MAX_HDR_READ #define MAX_HDR_READ (1 << 6)
#define MAX_HDR_READ 32
#endif
#if !ISPOWEROF2(MAX_HDR_READ)
#error MAX_HDR_READ is not a power of 2!
#endif
#define MAX_RX_DATASZ 2048 #define MAX_RX_DATASZ 2048
/* Maximum milliseconds to wait for F2 to come up */ /* Maximum milliseconds to wait for F2 to come up */