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

diff --git a/drivers/staging/brcm80211/brcmfmac/Makefile b/drivers/staging/brcm80211/brcmfmac/Makefile
index da3c80575907289dc4506c69527e8babb68e4155..826a2ba6a73d519369753fed6e6f7e78e05c9e57 100644 (file)
--- a/drivers/staging/brcm80211/brcmfmac/Makefile
+++ b/drivers/staging/brcm80211/brcmfmac/Makefile
@@ -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 += \

diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_bus.h b/drivers/staging/brcm80211/brcmfmac/dhd_bus.h
index 653cf0daa0eb363005c14d9b64a74283d6ffa82a..24f578ab406ca443dca5eb1058bdff6ca296ed51 100644 (file)
--- a/drivers/staging/brcm80211/brcmfmac/dhd_bus.h
+++ b/drivers/staging/brcm80211/brcmfmac/dhd_bus.h
@@ -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)

diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c b/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
index 8e59086d6398ea651ff2dcfc3ce3d73fae4b6bdd..9b41891b1911424bec2cdd74304590dcb60ff99e 100644 (file)
--- a/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
+++ b/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
@@ -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 */