From patchwork Thu Jun 9 14:44:52 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roland Vossen X-Patchwork-Id: 865722 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p59Ejjn2010102 for ; Thu, 9 Jun 2011 14:45:45 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752786Ab1FIOpU (ORCPT ); Thu, 9 Jun 2011 10:45:20 -0400 Received: from mms1.broadcom.com ([216.31.210.17]:2490 "EHLO mms1.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752409Ab1FIOpR (ORCPT ); Thu, 9 Jun 2011 10:45:17 -0400 Received: from [10.9.200.133] by mms1.broadcom.com with ESMTP (Broadcom SMTP Relay (Email Firewall v6.3.2)); Thu, 09 Jun 2011 07:49:34 -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; Thu, 9 Jun 2011 07:44:58 -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 CA17E74D0C; Thu, 9 Jun 2011 07:45:05 -0700 (PDT) Received: from rvossenubuntu (unknown [10.176.68.21]) by mail-sj1-12.sj.broadcom.com (Postfix) with ESMTP id E30B42050B; Thu, 9 Jun 2011 07:45:04 -0700 (PDT) Received: from rvossen by rvossenubuntu with local (Exim 4.74) ( envelope-from ) id 1QUgTn-0002PL-MW; Thu, 09 Jun 2011 16:45:03 +0200 From: "Roland Vossen" To: gregkh@suse.de cc: devel@linuxdriverproject.org, linux-wireless@vger.kernel.org Subject: [PATCH 12/21] staging: brcm80211: use __BIG_ENDIAN macro in dma.c Date: Thu, 9 Jun 2011 16:44:52 +0200 Message-ID: <1307630701-9170-13-git-send-email-rvossen@broadcom.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1307630701-9170-1-git-send-email-rvossen@broadcom.com> References: <1307630701-9170-1-git-send-email-rvossen@broadcom.com> MIME-Version: 1.0 X-WSS-ID: 61EE02F43B41247511-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 (demeter1.kernel.org [140.211.167.41]); Thu, 09 Jun 2011 14:45:45 +0000 (UTC) From: Arend van Spriel The source file dma.c used a macro definition that indicated a big endian platform. The linux tree has its own macro determined by architecture and/or kernel configuration. This byteorder macro is __BIG_ENDIAN. This is now used in dma.c. Signed-off-by: Arend van Spriel Reviewed-by: Roland Vossen Reviewed-by: Franky Lin --- drivers/staging/brcm80211/brcmsmac/dma.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/staging/brcm80211/brcmsmac/dma.c b/drivers/staging/brcm80211/brcmsmac/dma.c index adf364c..9a9f0e7 100644 --- a/drivers/staging/brcm80211/brcmsmac/dma.c +++ b/drivers/staging/brcm80211/brcmsmac/dma.c @@ -507,9 +507,9 @@ struct dma_pub *dma_attach(char *name, struct si_pub *sih, di->dataoffsetlow = di->ddoffsetlow; di->dataoffsethigh = di->ddoffsethigh; } -#if defined(__mips__) && defined(IL_BIGENDIAN) +#if defined(__mips__) && defined(__BIG_ENDIAN) di->dataoffsetlow = di->dataoffsetlow + SI_SDRAM_SWAPPED; -#endif /* defined(__mips__) && defined(IL_BIGENDIAN) */ +#endif /* defined(__mips__) && defined(__BIG_ENDIAN) */ /* WAR64450 : DMACtl.Addr ext fields are not supported in SDIOD core. */ if ((ai_coreid(sih) == SDIOD_CORE_ID) && ((ai_corerev(sih) > 0) && (ai_corerev(sih) <= 2))) @@ -624,12 +624,12 @@ dma64_dd_upd(dma_info_t *di, dma64dd_t *ddring, dmaaddr_t pa, uint outidx, u32 ctrl2 = bufcount & D64_CTRL2_BC_MASK; /* PCI bus with big(>1G) physical address, use address extension */ -#if defined(__mips__) && defined(IL_BIGENDIAN) +#if defined(__mips__) && defined(__BIG_ENDIAN) if ((di->dataoffsetlow == SI_SDRAM_SWAPPED) || !(PHYSADDRLO(pa) & PCI32ADDR_HIGH)) { #else if ((di->dataoffsetlow == 0) || !(PHYSADDRLO(pa) & PCI32ADDR_HIGH)) { -#endif /* defined(__mips__) && defined(IL_BIGENDIAN) */ +#endif /* defined(__mips__) && defined(__BIG_ENDIAN) */ W_SM(&ddring[outidx].addrlow, BUS_SWAP32(PHYSADDRLO(pa) + di->dataoffsetlow));