From patchwork Mon Aug 15 13:34:22 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arend van Spriel X-Patchwork-Id: 1067342 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 p7FDZ1wZ021112 for ; Mon, 15 Aug 2011 13:35:02 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753503Ab1HONe6 (ORCPT ); Mon, 15 Aug 2011 09:34:58 -0400 Received: from mms3.broadcom.com ([216.31.210.19]:3555 "EHLO MMS3.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753467Ab1HONem (ORCPT ); Mon, 15 Aug 2011 09:34:42 -0400 Received: from [10.9.200.133] by MMS3.broadcom.com with ESMTP (Broadcom SMTP Relay (Email Firewall v6.3.2)); Mon, 15 Aug 2011 06:39:46 -0700 X-Server-Uuid: B55A25B1-5D7D-41F8-BC53-C57E7AD3C201 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; Mon, 15 Aug 2011 06:34:14 -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 105F574D07; Mon, 15 Aug 2011 06:34:32 -0700 (PDT) Received: from arend-laptop (unknown [10.176.68.34]) by mail-sj1-12.sj.broadcom.com (Postfix) with ESMTP id CDA242050B; Mon, 15 Aug 2011 06:34:29 -0700 (PDT) Received: from arend by arend-laptop with local (Exim 4.74) ( envelope-from ) id 1QsxJE-0001OD-K5; Mon, 15 Aug 2011 15:34:28 +0200 From: "Arend van Spriel" To: gregkh@suse.de cc: devel@linuxdriverproject.org, linux-wireless@vger.kernel.org, "Henry Ptasinski" , "Arend van Spriel" Subject: [PATCH 10/15] staging: brcm80211: Remove swaps in R_REG and W_REG macros Date: Mon, 15 Aug 2011 15:34:22 +0200 Message-ID: <1313415267-5264-11-git-send-email-arend@broadcom.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1313415267-5264-1-git-send-email-arend@broadcom.com> References: <1313415267-5264-1-git-send-email-arend@broadcom.com> MIME-Version: 1.0 X-WSS-ID: 6257FE283KO6053765-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]); Mon, 15 Aug 2011 13:35:02 +0000 (UTC) From: Henry Ptasinski Swapping the addresses is unnecessary, since the swaps are handled by the underlying platform code (i.e. readb() etc. handle any necessary swapping). Tested on Mac G5 PPC and BCM63281. Signed-off-by: Henry Ptasinski Reviewed-by: Arend van Spriel Tested-by: Jonas Gorski Signed-off-by: Arend van Spriel --- drivers/staging/brcm80211/brcmsmac/types.h | 19 ++++--------------- 1 files changed, 4 insertions(+), 15 deletions(-) diff --git a/drivers/staging/brcm80211/brcmsmac/types.h b/drivers/staging/brcm80211/brcmsmac/types.h index c0d41cc..ad874a7 100644 --- a/drivers/staging/brcm80211/brcmsmac/types.h +++ b/drivers/staging/brcm80211/brcmsmac/types.h @@ -329,28 +329,17 @@ do { \ * location are defined in only one spot. This reduces the risk of the * programmer trying to use an unsupported transaction size on a register. * - * For big endian operation, a byte swap has to be done. Eg, when attempting - * to read byte address 0, byte 3 should be read. This is accomplished - * using an xor ('^') operator. */ -#ifndef __BIG_ENDIAN -#define SWP2(r) (r) -#define SWP3(r) (r) -#else -#define SWP2(r) ((unsigned long)(r)^2) -#define SWP3(r) ((unsigned long)(r)^3) -#endif /* __BIG_ENDIAN */ - #define R_REG(r) \ ({ \ __typeof(*(r)) __osl_v; \ switch (sizeof(*(r))) { \ case sizeof(u8): \ - __osl_v = readb((u8 *)(SWP3(r))); \ + __osl_v = readb((u8 *)(r)); \ break; \ case sizeof(u16): \ - __osl_v = readw((u16 *)(SWP2(r))); \ + __osl_v = readw((u16 *)(r)); \ break; \ case sizeof(u32): \ __osl_v = readl((u32 *)(r)); \ @@ -362,10 +351,10 @@ do { \ #define W_REG(r, v) do { \ switch (sizeof(*(r))) { \ case sizeof(u8): \ - writeb((u8)(v), (u8 *)(SWP3(r))); \ + writeb((u8)(v), (u8 *)(r)); \ break; \ case sizeof(u16): \ - writew((u16)(v), (u16 *)(SWP2(r))); \ + writew((u16)(v), (u16 *)(r)); \ break; \ case sizeof(u32): \ writel((u32)(v), (u32 *)(r)); \