From patchwork Fri Aug 26 13:19:31 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roland Vossen X-Patchwork-Id: 1102252 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p7QDJumL012696 for ; Fri, 26 Aug 2011 13:19:56 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755187Ab1HZNTw (ORCPT ); Fri, 26 Aug 2011 09:19:52 -0400 Received: from mms1.broadcom.com ([216.31.210.17]:3692 "EHLO mms1.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755141Ab1HZNTv (ORCPT ); Fri, 26 Aug 2011 09:19:51 -0400 Received: from [10.9.200.133] by mms1.broadcom.com with ESMTP (Broadcom SMTP Relay (Email Firewall v6.3.2)); Fri, 26 Aug 2011 06:25:51 -0700 X-Server-Uuid: 02CED230-5797-4B57-9875-D5D2FEE4708A Received: from mail-irva-13.broadcom.com (10.11.16.103) by IRVEXCHHUB02.corp.ad.broadcom.com (10.9.200.133) with Microsoft SMTP Server id 8.2.247.2; Fri, 26 Aug 2011 06:19:25 -0700 Received: from mail-sj1-12.sj.broadcom.com (mail-sj1-12.sj.broadcom.com [10.17.16.106]) by mail-irva-13.broadcom.com (Postfix) with ESMTP id 74B0574D03; Fri, 26 Aug 2011 06:19:44 -0700 (PDT) Received: from LTAMS-RVOSSEN (unknown [10.176.68.25]) by mail-sj1-12.sj.broadcom.com (Postfix) with ESMTP id 9DC0720505; Fri, 26 Aug 2011 06:19:42 -0700 (PDT) Received: from rvossen by LTAMS-RVOSSEN with local (Exim 4.74) ( envelope-from ) id 1QwwJx-0002TX-OG; Fri, 26 Aug 2011 15:19:41 +0200 From: "Roland Vossen" To: gregkh@suse.de cc: devel@linuxdriverproject.org, linux-wireless@vger.kernel.org Subject: [PATCH 04/13] staging: brcm80211: remove macro definitions from brcmfmac Makefile Date: Fri, 26 Aug 2011 15:19:31 +0200 Message-ID: <1314364780-9462-5-git-send-email-rvossen@broadcom.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1314364780-9462-1-git-send-email-rvossen@broadcom.com> References: <1314364780-9462-1-git-send-email-rvossen@broadcom.com> MIME-Version: 1.0 X-WSS-ID: 624941554R02605528-01-01 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Fri, 26 Aug 2011 13:19:56 +0000 (UTC) From: Arend van Spriel 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 Reviewed-by: Franky (Zhenhui) Lin Reviewed-by: Roland Vossen Signed-off-by: Roland Vossen --- drivers/staging/brcm80211/brcmfmac/Makefile | 5 ----- drivers/staging/brcm80211/brcmfmac/dhd_bus.h | 7 +------ drivers/staging/brcm80211/brcmfmac/dhd_sdio.c | 15 ++------------- 3 files changed, 3 insertions(+), 24 deletions(-) diff --git a/drivers/staging/brcm80211/brcmfmac/Makefile b/drivers/staging/brcm80211/brcmfmac/Makefile index da3c805..826a2ba 100644 --- 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 653cf0d..24f578a 100644 --- 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 8e59086..9b41891 100644 --- 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 */