提交 f66a27de 编写于 作者: A Arend van Spriel 提交者: Greg Kroah-Hartman

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: NJohannes Berg <johannes@sipsolutions.net>
Reviewed-by: NFranky (Zhenhui) Lin <frankyl@broadcom.com>
Reviewed-by: NRoland Vossen <rvossen@broadcom.com>
Signed-off-by: NRoland Vossen <rvossen@broadcom.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
上级 1bf8b110
...@@ -15,11 +15,6 @@ ...@@ -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 += \
......
...@@ -18,12 +18,7 @@ ...@@ -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)
......
...@@ -130,13 +130,8 @@ struct rte_console { ...@@ -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 { ...@@ -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 */
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册