From patchwork Mon Jul 18 14:29:51 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: 986822 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 p6IEUTjk002810 for ; Mon, 18 Jul 2011 14:30:29 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754628Ab1GROaZ (ORCPT ); Mon, 18 Jul 2011 10:30:25 -0400 Received: from mms2.broadcom.com ([216.31.210.18]:4197 "EHLO mms2.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751664Ab1GROaX (ORCPT ); Mon, 18 Jul 2011 10:30:23 -0400 Received: from [10.9.200.133] by mms2.broadcom.com with ESMTP (Broadcom SMTP Relay (Email Firewall v6.3.2)); Mon, 18 Jul 2011 07:35:07 -0700 X-Server-Uuid: D3C04415-6FA8-4F2C-93C1-920E106A2031 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, 18 Jul 2011 07:29:55 -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 E681C74D04; Mon, 18 Jul 2011 07:30:09 -0700 (PDT) Received: from arend-laptop (unknown [10.176.68.34]) by mail-sj1-12.sj.broadcom.com (Postfix) with ESMTP id 85C3B20506; Mon, 18 Jul 2011 07:30:07 -0700 (PDT) Received: from arend by arend-laptop with local (Exim 4.74) ( envelope-from ) id 1Qiopi-0002dO-Di; Mon, 18 Jul 2011 16:30:06 +0200 From: "Arend van Spriel" To: gregkh@suse.de cc: "Roland Vossen" , linux-wireless@vger.kernel.org, devel@linuxdriverproject.org, "Arend van Spriel" Subject: [PATCH 05/19] staging: brcm80211: remove MIPS specific 'sync' instruction in fullmac Date: Mon, 18 Jul 2011 16:29:51 +0200 Message-ID: <1310999405-10062-6-git-send-email-arend@broadcom.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1310999405-10062-1-git-send-email-arend@broadcom.com> References: <1310999405-10062-1-git-send-email-arend@broadcom.com> MIME-Version: 1.0 X-WSS-ID: 623A9B115ZC3717563-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]); Mon, 18 Jul 2011 14:30:29 +0000 (UTC) From: Roland Vossen This instruction was required for the bcm4716/bcm4322, but since the fullmac driver only supports bcm4329, it could be removed. After that, the R_REG macro's were identical and thus were reduced to just 1 R_REG macro. Cc: linux-wireless@vger.kernel.org Cc: devel@linuxdriverproject.org Reviewed-by: Pieter-Paul Giesberts Reviewed-by: Franky (Zhenhui) Lin Signed-off-by: Arend van Spriel --- drivers/staging/brcm80211/brcmfmac/dhd_sdio.c | 18 ------------------ 1 files changed, 0 insertions(+), 18 deletions(-) diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c b/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c index 8cb34d6..8224ba4 100644 --- a/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c +++ b/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c @@ -35,26 +35,8 @@ #include "sdio_host.h" /* register access macros */ -#ifndef __BIG_ENDIAN -#ifndef __mips__ #define R_REG(r, typ) \ brcmf_sdcard_reg_read(NULL, (r), sizeof(typ)) -#else /* __mips__ */ -#define R_REG(r, typ) \ - ({ \ - __typeof(*(r)) __osl_v; \ - __asm__ __volatile__("sync"); \ - __osl_v = brcmf_sdcard_reg_read(NULL, (r),\ - sizeof(typ)); \ - __asm__ __volatile__("sync"); \ - __osl_v; \ - }) -#endif /* __mips__ */ - -#else /* __BIG_ENDIAN */ -#define R_REG(r, typ) \ - brcmf_sdcard_reg_read(NULL, (r), sizeof(typ)) -#endif /* __BIG_ENDIAN */ #define OR_REG(r, v, typ) \ brcmf_sdcard_reg_write(NULL, (r), sizeof(typ), R_REG(r, typ) | (v))